summaryrefslogtreecommitdiff
path: root/clutter/clutter-feature.h
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@openedhand.com>2008-10-30 17:04:34 +0000
committerEmmanuele Bassi <ebassi@openedhand.com>2008-10-30 17:04:34 +0000
commita32eca26b647e442e2c35c86a1cf4a78f733f8c4 (patch)
tree3c044fd626d383c9f68250de23e6942df86f2883 /clutter/clutter-feature.h
parent36e30239af07ece6747aa5c8bf533c1ab5d1ce38 (diff)
downloadclutter-a32eca26b647e442e2c35c86a1cf4a78f733f8c4.tar.gz
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1212 - Allow only a single include file for Clutter * clutter/*.h: Only allow including clutter.h in third party code. * clutter/cogl/cogl-color.h: * clutter/cogl/cogl-fixed.h: * clutter/cogl/cogl.h.in: Only allow including cogl.h in third party code. * clutter/cogl/common/Makefile.am: * clutter/cogl/gl/Makefile.am: * clutter/cogl/gles/Makefile.am: * clutter/eglnative/Makefile.am: * clutter/eglx/Makefile.am: * clutter/fruity/Makefile.am: * clutter/glx/Makefile.am: * clutter/glx/clutter-glx.h: * clutter/osx/Makefile.am: * clutter/pango/Makefile.am: * clutter/sdl/Makefile.am: * clutter/win32/Makefile.am: * clutter/x11/Makefile.am: Fix build environment. * clutter/x11/clutter-x11-texture-pixmap.h: * clutter/x11/clutter-x11.h: Fix inclusion rules. * tests/test-pixmap.c: Fix inclusion of GdkPixbuf header. * README: Update release notes.
Diffstat (limited to 'clutter/clutter-feature.h')
-rw-r--r--clutter/clutter-feature.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/clutter/clutter-feature.h b/clutter/clutter-feature.h
index 89be737ea..864606634 100644
--- a/clutter/clutter-feature.h
+++ b/clutter/clutter-feature.h
@@ -18,10 +18,13 @@
* 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, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
+
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
/**
* SECTION:clutter-main
* @short_description: Various 'global' clutter functions.
@@ -30,8 +33,8 @@
* functions for mainloops, events and threads
*/
-#ifndef _HAVE_CLUTTER_FEATURE_H
-#define _HAVE_CLUTTER_FEATURE_H
+#ifndef __CLUTTER_FEATURE_H__
+#define __CLUTTER_FEATURE_H__
#include <glib.h>
@@ -74,5 +77,4 @@ ClutterFeatureFlags clutter_feature_get_all (void);
G_END_DECLS
-#endif
-
+#endif /* __CLUTTER_FEATURE_H__ */