babl r367 - in trunk: . babl

[martinn svn gnome org]

Author: martinn
Date: Sat Jan 17 10:43:32 2009
New Revision: 367
URL: http://svn.gnome.org/viewvc/babl?rev=367&view=rev

Log:
* babl/babl-macros.h: New installed header file that contains
portability macros.

* babl/babl.h: Include it and don't define portability macros
here.

* babl/Makefile.am: Add it.


Added:
   trunk/babl/babl-macros.h
Modified:
   trunk/ChangeLog
   trunk/babl/Makefile.am
   trunk/babl/babl.h

Modified: trunk/babl/Makefile.am
==============================================================================
--- trunk/babl/Makefile.am	(original)
+++ trunk/babl/Makefile.am	Sat Jan 17 10:43:32 2009
@@ -37,6 +37,7 @@
 	babl-db.h			\
 	babl-ids.h			\
 	babl-internal.h			\
+	babl-macros.h			\
 	babl-memory.h			\
 	babl-util.h			\
 	babl.h				\
@@ -53,6 +54,7 @@
 	babl-fish.h			\
 	babl-format.h			\
 	babl-image.h			\
+	babl-macros.h			\
 	babl-model.h			\
 	babl-sampling.h 		\
 	babl-type.h                     \

Added: trunk/babl/babl-macros.h
==============================================================================
--- (empty file)
+++ trunk/babl/babl-macros.h	Sat Jan 17 10:43:32 2009
@@ -0,0 +1,32 @@
+/* babl - dynamically extendable universal pixel conversion library.
+ * Copyright (C) 2005-2008, Ãyvind KolÃs and others.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BABL_MACROS_H
+#define _BABL_MACROS_H
+
+#ifndef _BABL_H
+#error  this file is only to be included by babl.h
+#endif
+
+#if     __GNUC__ >= 4
+#define BABL_ARG_NULL_TERMINATED __attribute__((__sentinel__))
+#else
+#define BABL_ARG_NULL_TERMINATED
+#endif
+
+#endif

Modified: trunk/babl/babl.h
==============================================================================
--- trunk/babl/babl.h	(original)
+++ trunk/babl/babl.h	Sat Jan 17 10:43:32 2009
@@ -30,6 +30,8 @@
 #error babl.h included after babl-internal.h
 #endif
 
+#include "babl-macros.h"
+
 /* magic number used at the start of all babl objects, used to do
  * differentiation in polymorphic functions. (as well as manual
  * type check assertions).
@@ -83,12 +85,6 @@
  */
 void   babl_destroy    (void);
 
-#if     __GNUC__ >= 4
-#define BABL_ARG_NULL_TERMINATED __attribute__((__sentinel__))
-#else
-#define BABL_ARG_NULL_TERMINATED
-#endif
-
 typedef int  (*BablEachFunction) (Babl *entry,
                                   void *data);