Add G_BEGIN_DECLS and G_END_DECLS around headers where missing, so that they work when included from C++ code

Original commit message from CVS:
Add G_BEGIN_DECLS and G_END_DECLS around headers where missing, so that they work when included from C++ code
This commit is contained in:
Tim-Philipp Müller 2005-02-09 22:31:05 +00:00
parent 6b55d8f1eb
commit 38f505b3c8
12 changed files with 57 additions and 12 deletions

View file

@ -1,3 +1,18 @@
2005-02-09 Tim-Philipp Müller <tim at centricular dot net>
* gst-libs/gst/audio/multichannel.h:
* gst-libs/gst/gconf/gconf.h:
* gst-libs/gst/idct/idct.h:
* gst-libs/gst/media-info/media-info-priv.h:
* gst-libs/gst/play/play.h:
* gst-libs/gst/resample/private.h:
* gst-libs/gst/resample/resample.h:
* gst-libs/gst/riff/riff-ids.h:
* gst-libs/gst/video/video.h:
* gst-libs/gst/video/videosink.h:
Add G_BEGIN_DECLS and G_END_DECLS around headers where
missing, so that they work when included from C++ code.
2005-02-09 David Schleef <ds@schleef.org> 2005-02-09 David Schleef <ds@schleef.org>
* testsuite/gst-lint: Check for non-statically scoped * testsuite/gst-lint: Check for non-statically scoped

View file

@ -23,6 +23,8 @@
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/multichannel-enumtypes.h> #include <gst/audio/multichannel-enumtypes.h>
G_BEGIN_DECLS
typedef enum { typedef enum {
GST_AUDIO_CHANNEL_POSITION_INVALID = -1, GST_AUDIO_CHANNEL_POSITION_INVALID = -1,
@ -83,4 +85,6 @@ void gst_audio_set_caps_channel_positions_list
GstAudioChannelPosition * GstAudioChannelPosition *
gst_audio_fixate_channel_positions (GstStructure *str); gst_audio_fixate_channel_positions (GstStructure *str);
G_END_DECLS
#endif /* __GST_AUDIO_MULTICHANNEL_H__ */ #endif /* __GST_AUDIO_MULTICHANNEL_H__ */

View file

@ -27,6 +27,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
G_BEGIN_DECLS
gchar * gst_gconf_get_string (const gchar *key); gchar * gst_gconf_get_string (const gchar *key);
void gst_gconf_set_string (const gchar *key, void gst_gconf_set_string (const gchar *key,
const gchar *value); const gchar *value);
@ -40,4 +42,6 @@ GstElement * gst_gconf_get_default_video_src (void);
GstElement * gst_gconf_get_default_audio_src (void); GstElement * gst_gconf_get_default_audio_src (void);
GstElement * gst_gconf_get_default_visualization_element (void); GstElement * gst_gconf_get_default_visualization_element (void);
G_END_DECLS
#endif /* GST_GCONF_H */ #endif /* GST_GCONF_H */

View file

@ -23,6 +23,8 @@
#include <glib.h> #include <glib.h>
G_BEGIN_DECLS
typedef enum { typedef enum {
GST_IDCT_DEFAULT, GST_IDCT_DEFAULT,
GST_IDCT_INT, GST_IDCT_INT,
@ -48,4 +50,6 @@ GstIDCT *gst_idct_new(GstIDCTMethod method);
#define gst_idct_convert_sparse(idct, blocks) (idct)->convert_sparse((blocks)) #define gst_idct_convert_sparse(idct, blocks) (idct)->convert_sparse((blocks))
void gst_idct_destroy(GstIDCT *idct); void gst_idct_destroy(GstIDCT *idct);
G_END_DECLS
#endif /* __GST_IDCT_H__ */ #endif /* __GST_IDCT_H__ */

View file

@ -25,6 +25,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
G_BEGIN_DECLS
/* debug */ /* debug */
GST_DEBUG_CATEGORY_EXTERN (gst_media_info_debug); GST_DEBUG_CATEGORY_EXTERN (gst_media_info_debug);
#define GST_CAT_DEFAULT gst_media_info_debug #define GST_CAT_DEFAULT gst_media_info_debug
@ -152,4 +154,6 @@ gboolean gmip_find_track_format_pre (GstMediaInfoPriv *priv);
gboolean gmip_find_track_format_post (GstMediaInfoPriv *priv); gboolean gmip_find_track_format_post (GstMediaInfoPriv *priv);
gboolean gmip_find_track_format (GstMediaInfoPriv *priv); gboolean gmip_find_track_format (GstMediaInfoPriv *priv);
G_END_DECLS
#endif /* __GST_MEDIA_INFO_PRIV_H__ */ #endif /* __GST_MEDIA_INFO_PRIV_H__ */

View file

@ -24,6 +24,8 @@
#include <gst/xoverlay/xoverlay.h> #include <gst/xoverlay/xoverlay.h>
#include <gst/play/play-enumtypes.h> #include <gst/play/play-enumtypes.h>
G_BEGIN_DECLS
/* GError stuff */ /* GError stuff */
#define GST_PLAY_ERROR gst_play_error_quark () #define GST_PLAY_ERROR gst_play_error_quark ()
@ -97,4 +99,6 @@ GList * gst_play_get_all_by_interface (GstPlay *play,
gdouble gst_play_get_framerate (GstPlay *play); gdouble gst_play_get_framerate (GstPlay *play);
G_END_DECLS
#endif /* __GST_PLAY_H__ */ #endif /* __GST_PLAY_H__ */

View file

@ -23,6 +23,8 @@
#include "resample.h" #include "resample.h"
G_BEGIN_DECLS
void gst_resample_nearest_s16(gst_resample_t *r); void gst_resample_nearest_s16(gst_resample_t *r);
void gst_resample_bilinear_s16(gst_resample_t *r); void gst_resample_bilinear_s16(gst_resample_t *r);
void gst_resample_sinc_s16(gst_resample_t *r); void gst_resample_sinc_s16(gst_resample_t *r);
@ -111,4 +113,6 @@ void conv_float_double_ref(float *dest, double *src, int n);
void conv_double_float_dstr(double *dest, float *src, int n, int dstr); void conv_double_float_dstr(double *dest, float *src, int n, int dstr);
void conv_float_double_sstr(float *dest, double *src, int n, int sstr); void conv_float_double_sstr(float *dest, double *src, int n, int sstr);
G_END_DECLS
#endif /* __PRIVATE_H__ */ #endif /* __PRIVATE_H__ */

View file

@ -21,6 +21,10 @@
#ifndef __GST_RESAMPLE_H__ #ifndef __GST_RESAMPLE_H__
#define __GST_RESAMPLE_H__ #define __GST_RESAMPLE_H__
#include <glib.h>
G_BEGIN_DECLS
typedef enum { typedef enum {
GST_RESAMPLE_NEAREST = 0, GST_RESAMPLE_NEAREST = 0,
GST_RESAMPLE_BILINEAR, GST_RESAMPLE_BILINEAR,
@ -102,4 +106,6 @@ void gst_resample_close (gst_resample_t * r);
void gst_resample_scale(gst_resample_t *r, void *i_buf, unsigned int size); void gst_resample_scale(gst_resample_t *r, void *i_buf, unsigned int size);
G_END_DECLS
#endif /* __GST_RESAMPLE_H__ */ #endif /* __GST_RESAMPLE_H__ */

View file

@ -24,6 +24,8 @@
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS
/* RIFF types */ /* RIFF types */
#define GST_RIFF_RIFF_WAVE GST_MAKE_FOURCC ('W','A','V','E') #define GST_RIFF_RIFF_WAVE GST_MAKE_FOURCC ('W','A','V','E')
#define GST_RIFF_RIFF_AVI GST_MAKE_FOURCC ('A','V','I',' ') #define GST_RIFF_RIFF_AVI GST_MAKE_FOURCC ('A','V','I',' ')
@ -328,4 +330,6 @@ typedef struct _gst_riff_dmlh {
guint32 totalframes; guint32 totalframes;
} gst_riff_dmlh; } gst_riff_dmlh;
G_END_DECLS
#endif /* __GST_RIFF_IDS_H__ */ #endif /* __GST_RIFF_IDS_H__ */

View file

@ -24,9 +24,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GST_TYPE_VIDEOSINK (gst_videosink_get_type()) #define GST_TYPE_VIDEOSINK (gst_videosink_get_type())
#define GST_VIDEOSINK(obj) \ #define GST_VIDEOSINK(obj) \
@ -68,8 +66,6 @@ struct _GstVideoSinkClass {
GType gst_videosink_get_type (void); GType gst_videosink_get_type (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GST_VIDEOSINK_H__ */ #endif /* __GST_VIDEOSINK_H__ */

View file

@ -23,6 +23,8 @@
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS
#define GST_VIDEO_BYTE1_MASK_32 "0xFF000000" #define GST_VIDEO_BYTE1_MASK_32 "0xFF000000"
#define GST_VIDEO_BYTE2_MASK_32 "0x00FF0000" #define GST_VIDEO_BYTE2_MASK_32 "0x00FF0000"
#define GST_VIDEO_BYTE3_MASK_32 "0x0000FF00" #define GST_VIDEO_BYTE3_MASK_32 "0x0000FF00"
@ -187,4 +189,6 @@ gboolean gst_video_get_size (GstPad *pad,
gint *width, gint *width,
gint *height); gint *height);
G_END_DECLS
#endif /* __GST_VIDEO_H__ */ #endif /* __GST_VIDEO_H__ */

View file

@ -24,9 +24,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GST_TYPE_VIDEOSINK (gst_videosink_get_type()) #define GST_TYPE_VIDEOSINK (gst_videosink_get_type())
#define GST_VIDEOSINK(obj) \ #define GST_VIDEOSINK(obj) \
@ -68,8 +66,6 @@ struct _GstVideoSinkClass {
GType gst_videosink_get_type (void); GType gst_videosink_get_type (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GST_VIDEOSINK_H__ */ #endif /* __GST_VIDEOSINK_H__ */