From e640a4ab6a5742289cacf10bc96601320ddff4d3 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <kusmabite@gmail.com>
Date: Tue, 6 Jul 2010 23:00:31 +0200
Subject: [PATCH] editor: explicit C-declaration around sync/data.h

Trade an explicit extern "C" declaration for three
defined(__cplusplus) wrapped ones.
---
 editor/syncdocument.h | 3 +++
 sync/data.h           | 8 --------
 sync/device.h         | 8 --------
 sync/track.h          | 8 --------
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/editor/syncdocument.h b/editor/syncdocument.h
index 6f64007..7ee32d1 100644
--- a/editor/syncdocument.h
+++ b/editor/syncdocument.h
@@ -4,7 +4,10 @@
 
 #pragma once
 
+extern "C" {
 #include "../sync/data.h"
+}
+
 #include <stack>
 #include <list>
 #include <vector>
diff --git a/sync/data.h b/sync/data.h
index 353f677..ec09898 100644
--- a/sync/data.h
+++ b/sync/data.h
@@ -7,10 +7,6 @@
 
 #include "track.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct sync_data {
 	struct sync_track **tracks;
 	size_t num_tracks;
@@ -28,8 +24,4 @@ static inline int sync_find_track(struct sync_data *data, const char *name)
 void sync_data_deinit(struct sync_data *);
 int sync_create_track(struct sync_data *, const char *);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* SYNC_DATA_H */
diff --git a/sync/device.h b/sync/device.h
index 9dab067..a02de0b 100644
--- a/sync/device.h
+++ b/sync/device.h
@@ -8,10 +8,6 @@
 #include "track.h"
 #include "data.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct sync_device {
 	char *base;
 	struct sync_data data;
@@ -24,8 +20,4 @@ struct sync_device {
 #endif
 };
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* SYNC_DEVICE_H */
diff --git a/sync/track.h b/sync/track.h
index 4909db5..1946f6d 100644
--- a/sync/track.h
+++ b/sync/track.h
@@ -9,10 +9,6 @@
 #include <stdlib.h>
 #include "base.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum key_type {
 	KEY_STEP,   /* stay constant */
 	KEY_LINEAR, /* lerp to the next value */
@@ -52,8 +48,4 @@ static inline int is_key_frame(const struct sync_track *t, size_t row)
 
 #endif /* !defined(SYNC_PLAYER) */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* SYNC_TRACK_H */