vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

editor: explicit C-declaration around sync/data.h

Browse Source 
Trade an explicit extern "C" declaration for three
defined(__cplusplus) wrapped ones.
This commit is contained in:
Erik Faye-Lund 2010-07-06 23:00:31 +02:00
parent 12595c74f5
commit e640a4ab6a
4 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/syncdocument.h
View File

@ -4,7 +4,10 @@
#pragma once #pragma once
extern "C" {
#include "../sync/data.h" #include "../sync/data.h"
}
#include <stack> #include <stack>
#include <list> #include <list>
#include <vector> #include <vector>

8
sync/data.h
View File

@ -7,10 +7,6 @@
#include "track.h" #include "track.h"
#ifdef __cplusplus
extern "C" {
#endif
struct sync_data { struct sync_data {
struct sync_track **tracks; struct sync_track **tracks;
size_t num_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 *); void sync_data_deinit(struct sync_data *);
int sync_create_track(struct sync_data *, const char *); int sync_create_track(struct sync_data *, const char *);
#ifdef __cplusplus
}
#endif
#endif /* SYNC_DATA_H */ #endif /* SYNC_DATA_H */

8
sync/device.h
View File

@ -8,10 +8,6 @@
#include "track.h" #include "track.h"
#include "data.h" #include "data.h"
#ifdef __cplusplus
extern "C" {
#endif
struct sync_device { struct sync_device {
char *base; char *base;
struct sync_data data; struct sync_data data;
@ -24,8 +20,4 @@ struct sync_device {
#endif #endif
}; };
#ifdef __cplusplus
}
#endif
#endif /* SYNC_DEVICE_H */ #endif /* SYNC_DEVICE_H */

8
sync/track.h
View File

@ -9,10 +9,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "base.h" #include "base.h"
#ifdef __cplusplus
extern "C" {
#endif
enum key_type { enum key_type {
KEY_STEP, /* stay constant */ KEY_STEP, /* stay constant */
KEY_LINEAR, /* lerp to the next value */ 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) */ #endif /* !defined(SYNC_PLAYER) */
#ifdef __cplusplus
}
#endif
#endif /* SYNC_TRACK_H */ #endif /* SYNC_TRACK_H */