mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
More forte compiler fixes, added a .h file to store commonly used macros that have to ifdefed out on non-gcc compilers
Original commit message from CVS: More forte compiler fixes, added a .h file to store commonly used macros that have to ifdefed out on non-gcc compilers
This commit is contained in:
parent
95d4c6fdf1
commit
fa3381146a
6 changed files with 41 additions and 10 deletions
|
@ -114,6 +114,7 @@ gst_headers = \
|
|||
gstformat.h \
|
||||
gstinfo.h \
|
||||
gstlog.h \
|
||||
gstmacros.h \
|
||||
gstmemchunk.h \
|
||||
gstpad.h \
|
||||
gstpipeline.h \
|
||||
|
|
|
@ -58,7 +58,7 @@ struct _GstMD5Sink {
|
|||
|
||||
guint32 total[2];
|
||||
guint32 buflen;
|
||||
gchar buffer[128] __attribute__ ((__aligned__ (__alignof__ (guint32))));
|
||||
gchar buffer[128];
|
||||
|
||||
/* latest md5 */
|
||||
guchar md5[16];
|
||||
|
|
33
gst/gstmacros.h
Normal file
33
gst/gstmacros.h
Normal file
|
@ -0,0 +1,33 @@
|
|||
/* GStreamer
|
||||
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the
|
||||
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef __GST_MACROS_H__
|
||||
#define __GST_MACROS_H__
|
||||
|
||||
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
|
||||
# define GST_GNUC_CONSTRUCTOR \
|
||||
__attribute__ ((constructor))
|
||||
#else /* !__GNUC__ */
|
||||
# define GST_GNUC_CONSTRUCTOR
|
||||
#endif /* !__GNUC__ */
|
||||
|
||||
|
||||
#endif /* __GST_MACROS_H__ */
|
||||
|
||||
|
|
@ -28,6 +28,7 @@
|
|||
|
||||
#include <gmodule.h>
|
||||
#include <gst/gstpluginfeature.h>
|
||||
#include <gst/gstmacros.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
@ -80,8 +81,8 @@ GstPluginDesc plugin_desc = { \
|
|||
#define GST_PLUGIN_DESC_DYNAMIC(major,minor,name,init)
|
||||
#endif
|
||||
#define GST_PLUGIN_DESC_STATIC(major,minor,name,init) \
|
||||
static void __attribute__ ((constructor)) \
|
||||
_gst_plugin_static_init__ ##init (void) \
|
||||
static void GST_GNUC_CONSTRUCTOR \
|
||||
_gst_plugin_static_init__ ##init (void) \
|
||||
{ \
|
||||
static GstPluginDesc plugin_desc_ = { \
|
||||
major, \
|
||||
|
|
|
@ -60,13 +60,9 @@ typedef enum {
|
|||
#define GST_STR_FOURCC(f) (guint32)(((f)[0])|((f)[1]<<8)|((f)[2]<<16)|((f)[3]<<24))
|
||||
|
||||
#ifdef G_HAVE_ISO_VARARGS
|
||||
|
||||
#define GST_PROPS_LIST(...) GST_PROPS_LIST_TYPE,__VA_ARGS__,NULL
|
||||
|
||||
# define GST_PROPS_LIST(...) GST_PROPS_LIST_TYPE,__VA_ARGS__,NULL
|
||||
#elif defined(G_HAVE_GNUC_VARARGS)
|
||||
|
||||
#define GST_PROPS_LIST(a...) GST_PROPS_LIST_TYPE,a,NULL
|
||||
|
||||
# define GST_PROPS_LIST(a...) GST_PROPS_LIST_TYPE,a,NULL
|
||||
#endif
|
||||
|
||||
#define GST_PROPS_GLIST(a) GST_PROPS_GLIST_TYPE,(a)
|
||||
|
|
|
@ -58,7 +58,7 @@ struct _GstMD5Sink {
|
|||
|
||||
guint32 total[2];
|
||||
guint32 buflen;
|
||||
gchar buffer[128] __attribute__ ((__aligned__ (__alignof__ (guint32))));
|
||||
gchar buffer[128];
|
||||
|
||||
/* latest md5 */
|
||||
guchar md5[16];
|
||||
|
|
Loading…
Reference in a new issue