From ced29277267476bbe4ba5e35f79a8d6a130cb989 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 14 Dec 2007 10:35:24 +0000 Subject: [PATCH] Only allow including from apps 2007-12-14 Alexander Larsson * Makefile.am: * fam/Makefile.am: * gappinfo.h: * gasyncresult.h: * gbufferedinputstream.h: * gbufferedoutputstream.h: * gcancellable.h: * gcontenttype.h: * gdatainputstream.h: * gdataoutputstream.h: * gdesktopappinfo.h: * gdirectorymonitor.h: * gdrive.h: * gfile.h: * gfileattribute.h: * gfileenumerator.h: * gfileicon.h: * gfileinfo.h: * gfileinputstream.h: * gfilemonitor.h: * gfilenamecompleter.h: * gfileoutputstream.h: * gfilterinputstream.h: * gfilteroutputstream.h: * gicon.h: * ginputstream.h: * gio.h: * gioerror.h: * giomodule.h: * gioscheduler.h: * gloadableicon.h: * gmemoryinputstream.h: * gmemoryoutputstream.h: * gmount.h: * gmountoperation.h: * goutputstream.h: * gseekable.h: * gsimpleasyncresult.h: * gthemedicon.h: * gunixinputstream.h: * gunixmounts.h: * gunixoutputstream.h: * gvfs.h: * gvolume.h: * gvolumemonitor.h: * inotify/Makefile.am: Only allow including from apps svn path=/trunk/; revision=6117 --- gio/ChangeLog | 50 +++++++++++++++++++++++++++++++++++++ gio/Makefile.am | 1 + gio/fam/Makefile.am | 1 + gio/gappinfo.h | 4 +++ gio/gasyncresult.h | 4 +++ gio/gbufferedinputstream.h | 4 +++ gio/gbufferedoutputstream.h | 4 +++ gio/gcancellable.h | 4 +++ gio/gcontenttype.h | 4 +++ gio/gdatainputstream.h | 4 +++ gio/gdataoutputstream.h | 4 +++ gio/gdesktopappinfo.h | 2 +- gio/gdirectorymonitor.h | 4 +++ gio/gdrive.h | 4 +++ gio/gfile.h | 4 +++ gio/gfileattribute.h | 4 +++ gio/gfileenumerator.h | 4 +++ gio/gfileicon.h | 4 +++ gio/gfileinfo.h | 4 +++ gio/gfileinputstream.h | 4 +++ gio/gfilemonitor.h | 4 +++ gio/gfilenamecompleter.h | 4 +++ gio/gfileoutputstream.h | 4 +++ gio/gfilterinputstream.h | 4 +++ gio/gfilteroutputstream.h | 4 +++ gio/gicon.h | 4 +++ gio/ginputstream.h | 4 +++ gio/gio.h | 4 +++ gio/gioerror.h | 4 +++ gio/giomodule.h | 4 +++ gio/gioscheduler.h | 4 +++ gio/gloadableicon.h | 4 +++ gio/gmemoryinputstream.h | 4 +++ gio/gmemoryoutputstream.h | 4 +++ gio/gmount.h | 4 +++ gio/gmountoperation.h | 4 +++ gio/goutputstream.h | 4 +++ gio/gseekable.h | 4 +++ gio/gsimpleasyncresult.h | 4 +++ gio/gthemedicon.h | 4 +++ gio/gunixinputstream.h | 2 +- gio/gunixmounts.h | 4 +-- gio/gunixoutputstream.h | 2 +- gio/gvfs.h | 4 +++ gio/gvolume.h | 4 +++ gio/gvolumemonitor.h | 4 +++ gio/inotify/Makefile.am | 1 + 47 files changed, 213 insertions(+), 6 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 09a8a8a41..9b524ba97 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,53 @@ +2007-12-14 Alexander Larsson + + * Makefile.am: + * fam/Makefile.am: + * gappinfo.h: + * gasyncresult.h: + * gbufferedinputstream.h: + * gbufferedoutputstream.h: + * gcancellable.h: + * gcontenttype.h: + * gdatainputstream.h: + * gdataoutputstream.h: + * gdesktopappinfo.h: + * gdirectorymonitor.h: + * gdrive.h: + * gfile.h: + * gfileattribute.h: + * gfileenumerator.h: + * gfileicon.h: + * gfileinfo.h: + * gfileinputstream.h: + * gfilemonitor.h: + * gfilenamecompleter.h: + * gfileoutputstream.h: + * gfilterinputstream.h: + * gfilteroutputstream.h: + * gicon.h: + * ginputstream.h: + * gio.h: + * gioerror.h: + * giomodule.h: + * gioscheduler.h: + * gloadableicon.h: + * gmemoryinputstream.h: + * gmemoryoutputstream.h: + * gmount.h: + * gmountoperation.h: + * goutputstream.h: + * gseekable.h: + * gsimpleasyncresult.h: + * gthemedicon.h: + * gunixinputstream.h: + * gunixmounts.h: + * gunixoutputstream.h: + * gvfs.h: + * gvolume.h: + * gvolumemonitor.h: + * inotify/Makefile.am: + Only allow including from apps + 2007-12-14 Alexander Larsson * gioscheduler.[ch]: diff --git a/gio/Makefile.am b/gio/Makefile.am index 07c9e8c27..e5dd24db8 100644 --- a/gio/Makefile.am +++ b/gio/Makefile.am @@ -31,6 +31,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/gmodule \ $(GLIB_DEBUG_FLAGS) \ -DG_DISABLE_DEPRECATED \ + -DGIO_COMPILATION \ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" lib_LTLIBRARIES = libgio-2.0.la diff --git a/gio/fam/Makefile.am b/gio/fam/Makefile.am index 3d9b4d592..3b7b4f8b5 100644 --- a/gio/fam/Makefile.am +++ b/gio/fam/Makefile.am @@ -24,6 +24,7 @@ libgiofam_la_CFLAGS = \ -I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gio \ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \ + -DGIO_COMPILATION \ -DG_DISABLE_DEPRECATED libgiofam_la_LDFLAGS = $(module_flags) diff --git a/gio/gappinfo.h b/gio/gappinfo.h index e7dfd3cc8..59d6f2fbe 100644 --- a/gio/gappinfo.h +++ b/gio/gappinfo.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_APP_INFO_H__ #define __G_APP_INFO_H__ diff --git a/gio/gasyncresult.h b/gio/gasyncresult.h index 123c20a7b..640d61118 100644 --- a/gio/gasyncresult.h +++ b/gio/gasyncresult.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_ASYNC_RESULT_H__ #define __G_ASYNC_RESULT_H__ diff --git a/gio/gbufferedinputstream.h b/gio/gbufferedinputstream.h index 8e9c1ea9f..3eea4f9bf 100644 --- a/gio/gbufferedinputstream.h +++ b/gio/gbufferedinputstream.h @@ -20,6 +20,10 @@ * Author: Christian Kellner */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_BUFFERED_INPUT_STREAM_H__ #define __G_BUFFERED_INPUT_STREAM_H__ diff --git a/gio/gbufferedoutputstream.h b/gio/gbufferedoutputstream.h index d47ecd0fc..134bf8282 100644 --- a/gio/gbufferedoutputstream.h +++ b/gio/gbufferedoutputstream.h @@ -20,6 +20,10 @@ * Author: Christian Kellner */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_BUFFERED_OUTPUT_STREAM_H__ #define __G_BUFFERED_OUTPUT_STREAM_H__ diff --git a/gio/gcancellable.h b/gio/gcancellable.h index 2697914e5..7c890be9c 100644 --- a/gio/gcancellable.h +++ b/gio/gcancellable.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_CANCELLABLE_H__ #define __G_CANCELLABLE_H__ diff --git a/gio/gcontenttype.h b/gio/gcontenttype.h index e8bbf5780..9dcbf149c 100644 --- a/gio/gcontenttype.h +++ b/gio/gcontenttype.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_CONTENT_TYPE_H__ #define __G_CONTENT_TYPE_H__ diff --git a/gio/gdatainputstream.h b/gio/gdatainputstream.h index 355752d2b..0ecd14f5b 100644 --- a/gio/gdatainputstream.h +++ b/gio/gdatainputstream.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_DATA_INPUT_STREAM_H__ #define __G_DATA_INPUT_STREAM_H__ diff --git a/gio/gdataoutputstream.h b/gio/gdataoutputstream.h index c5d704370..7a4e40557 100644 --- a/gio/gdataoutputstream.h +++ b/gio/gdataoutputstream.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_DATA_OUTPUT_STREAM_H__ #define __G_DATA_OUTPUT_STREAM_H__ diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h index 0f667dca3..6ed5853fa 100644 --- a/gio/gdesktopappinfo.h +++ b/gio/gdesktopappinfo.h @@ -23,7 +23,7 @@ #ifndef __G_DESKTOP_APP_INFO_H__ #define __G_DESKTOP_APP_INFO_H__ -#include +#include G_BEGIN_DECLS diff --git a/gio/gdirectorymonitor.h b/gio/gdirectorymonitor.h index 4425f7dd9..5909b5b78 100644 --- a/gio/gdirectorymonitor.h +++ b/gio/gdirectorymonitor.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_DIRECTORY_MONITOR_H__ #define __G_DIRECTORY_MONITOR_H__ diff --git a/gio/gdrive.h b/gio/gdrive.h index f36b3c86b..6d9e46310 100644 --- a/gio/gdrive.h +++ b/gio/gdrive.h @@ -21,6 +21,10 @@ * David Zeuthen */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_DRIVE_H__ #define __G_DRIVE_H__ diff --git a/gio/gfile.h b/gio/gfile.h index 07d799274..48574b1e9 100644 --- a/gio/gfile.h +++ b/gio/gfile.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_H__ #define __G_FILE_H__ diff --git a/gio/gfileattribute.h b/gio/gfileattribute.h index 0c96e99a1..0d419035a 100644 --- a/gio/gfileattribute.h +++ b/gio/gfileattribute.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_ATTRIBUTE_H__ #define __G_FILE_ATTRIBUTE_H__ diff --git a/gio/gfileenumerator.h b/gio/gfileenumerator.h index ffec2dd78..11d04fc46 100644 --- a/gio/gfileenumerator.h +++ b/gio/gfileenumerator.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_ENUMERATOR_H__ #define __G_FILE_ENUMERATOR_H__ diff --git a/gio/gfileicon.h b/gio/gfileicon.h index e31c42d09..18d73d0d0 100644 --- a/gio/gfileicon.h +++ b/gio/gfileicon.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_ICON_H__ #define __G_FILE_ICON_H__ diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h index 1614d125d..ec48d1e74 100644 --- a/gio/gfileinfo.h +++ b/gio/gfileinfo.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_INFO_H__ #define __G_FILE_INFO_H__ diff --git a/gio/gfileinputstream.h b/gio/gfileinputstream.h index 77e7f9f8d..5f1f89100 100644 --- a/gio/gfileinputstream.h +++ b/gio/gfileinputstream.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_INPUT_STREAM_H__ #define __G_FILE_INPUT_STREAM_H__ diff --git a/gio/gfilemonitor.h b/gio/gfilemonitor.h index 0fb4f2bb7..5b38f457e 100644 --- a/gio/gfilemonitor.h +++ b/gio/gfilemonitor.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_MONITOR_H__ #define __G_FILE_MONITOR_H__ diff --git a/gio/gfilenamecompleter.h b/gio/gfilenamecompleter.h index 4fd773458..c7fd38356 100644 --- a/gio/gfilenamecompleter.h +++ b/gio/gfilenamecompleter.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILENAME_COMPLETER_H__ #define __G_FILENAME_COMPLETER_H__ diff --git a/gio/gfileoutputstream.h b/gio/gfileoutputstream.h index b6982b51a..31627226d 100644 --- a/gio/gfileoutputstream.h +++ b/gio/gfileoutputstream.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILE_OUTPUT_STREAM_H__ #define __G_FILE_OUTPUT_STREAM_H__ diff --git a/gio/gfilterinputstream.h b/gio/gfilterinputstream.h index f8e82db41..ee6d91525 100644 --- a/gio/gfilterinputstream.h +++ b/gio/gfilterinputstream.h @@ -20,6 +20,10 @@ * Author: Christian Kellner */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILTER_INPUT_STREAM_H__ #define __G_FILTER_INPUT_STREAM_H__ diff --git a/gio/gfilteroutputstream.h b/gio/gfilteroutputstream.h index 124046ec1..ba2d968e7 100644 --- a/gio/gfilteroutputstream.h +++ b/gio/gfilteroutputstream.h @@ -20,6 +20,10 @@ * Author: Christian Kellner */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_FILTER_OUTPUT_STREAM_H__ #define __G_FILTER_OUTPUT_STREAM_H__ diff --git a/gio/gicon.h b/gio/gicon.h index b7dab6a87..dd028899a 100644 --- a/gio/gicon.h +++ b/gio/gicon.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_ICON_H__ #define __G_ICON_H__ diff --git a/gio/ginputstream.h b/gio/ginputstream.h index 8966136d6..3759fec77 100644 --- a/gio/ginputstream.h +++ b/gio/ginputstream.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_INPUT_STREAM_H__ #define __G_INPUT_STREAM_H__ diff --git a/gio/gio.h b/gio/gio.h index 5f4e7060d..606344ddd 100644 --- a/gio/gio.h +++ b/gio/gio.h @@ -23,6 +23,8 @@ #ifndef __G_IO_H__ #define __G_IO_H__ +#define __GIO_GIO_H_INSIDE__ + #include #include #include @@ -49,4 +51,6 @@ #include #include +#undef __GIO_GIO_H_INSIDE__ + #endif /* __G_IO_H__ */ diff --git a/gio/gioerror.h b/gio/gioerror.h index b928a9026..f024c09ba 100644 --- a/gio/gioerror.h +++ b/gio/gioerror.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_IO_ERROR_H__ #define __G_IO_ERROR_H__ diff --git a/gio/giomodule.h b/gio/giomodule.h index 36b6de7a6..bc2bb6725 100644 --- a/gio/giomodule.h +++ b/gio/giomodule.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_IO_MODULE_H__ #define __G_IO_MODULE_H__ diff --git a/gio/gioscheduler.h b/gio/gioscheduler.h index d70e2ad90..acc2e1e6e 100644 --- a/gio/gioscheduler.h +++ b/gio/gioscheduler.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_IO_SCHEDULER_H__ #define __G_IO_SCHEDULER_H__ diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h index 88f42df85..3854259d9 100644 --- a/gio/gloadableicon.h +++ b/gio/gloadableicon.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_LOADABLE_ICON_H__ #define __G_LOADABLE_ICON_H__ diff --git a/gio/gmemoryinputstream.h b/gio/gmemoryinputstream.h index d2449122c..fd07462eb 100644 --- a/gio/gmemoryinputstream.h +++ b/gio/gmemoryinputstream.h @@ -20,6 +20,10 @@ * Author: Christian Kellner */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_MEMORY_INPUT_STREAM_H__ #define __G_MEMORY_INPUT_STREAM_H__ diff --git a/gio/gmemoryoutputstream.h b/gio/gmemoryoutputstream.h index 56d77bf51..e52f23db3 100644 --- a/gio/gmemoryoutputstream.h +++ b/gio/gmemoryoutputstream.h @@ -20,6 +20,10 @@ * Author: Christian Kellner */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_MEMORY_OUTPUT_STREAM_H__ #define __G_MEMORY_OUTPUT_STREAM_H__ diff --git a/gio/gmount.h b/gio/gmount.h index 837fcc856..c413e6013 100644 --- a/gio/gmount.h +++ b/gio/gmount.h @@ -21,6 +21,10 @@ * David Zeuthen */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_MOUNT_H__ #define __G_MOUNT_H__ diff --git a/gio/gmountoperation.h b/gio/gmountoperation.h index 3b3b42a6f..35434fa16 100644 --- a/gio/gmountoperation.h +++ b/gio/gmountoperation.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_MOUNT_OPERATION_H__ #define __G_MOUNT_OPERATION_H__ diff --git a/gio/goutputstream.h b/gio/goutputstream.h index 4977d7dc6..8626bb1d6 100644 --- a/gio/goutputstream.h +++ b/gio/goutputstream.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_OUTPUT_STREAM_H__ #define __G_OUTPUT_STREAM_H__ diff --git a/gio/gseekable.h b/gio/gseekable.h index 052534903..78b8998c0 100644 --- a/gio/gseekable.h +++ b/gio/gseekable.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_SEEKABLE_H__ #define __G_SEEKABLE_H__ diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h index f1ab938fe..f2f9b36d2 100644 --- a/gio/gsimpleasyncresult.h +++ b/gio/gsimpleasyncresult.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_SIMPLE_ASYNC_RESULT_H__ #define __G_SIMPLE_ASYNC_RESULT_H__ diff --git a/gio/gthemedicon.h b/gio/gthemedicon.h index b249d3565..7c3a204dd 100644 --- a/gio/gthemedicon.h +++ b/gio/gthemedicon.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_THEMED_ICON_H__ #define __G_THEMED_ICON_H__ diff --git a/gio/gunixinputstream.h b/gio/gunixinputstream.h index 4eeaa4166..7bb7cd968 100644 --- a/gio/gunixinputstream.h +++ b/gio/gunixinputstream.h @@ -23,7 +23,7 @@ #ifndef __G_UNIX_INPUT_STREAM_H__ #define __G_UNIX_INPUT_STREAM_H__ -#include +#include G_BEGIN_DECLS diff --git a/gio/gunixmounts.h b/gio/gunixmounts.h index 1ad6f10ca..9be6c89ec 100644 --- a/gio/gunixmounts.h +++ b/gio/gunixmounts.h @@ -23,9 +23,7 @@ #ifndef __G_UNIX_MOUNTS_H__ #define __G_UNIX_MOUNTS_H__ -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/gio/gunixoutputstream.h b/gio/gunixoutputstream.h index 83cad9e8a..bfcf614d7 100644 --- a/gio/gunixoutputstream.h +++ b/gio/gunixoutputstream.h @@ -23,7 +23,7 @@ #ifndef __G_UNIX_OUTPUT_STREAM_H__ #define __G_UNIX_OUTPUT_STREAM_H__ -#include +#include G_BEGIN_DECLS diff --git a/gio/gvfs.h b/gio/gvfs.h index 3abc9b425..9400c6fb3 100644 --- a/gio/gvfs.h +++ b/gio/gvfs.h @@ -20,6 +20,10 @@ * Author: Alexander Larsson */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_VFS_H__ #define __G_VFS_H__ diff --git a/gio/gvolume.h b/gio/gvolume.h index 6c82bf7dd..02f5bc277 100644 --- a/gio/gvolume.h +++ b/gio/gvolume.h @@ -21,6 +21,10 @@ * David Zeuthen */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_VOLUME_H__ #define __G_VOLUME_H__ diff --git a/gio/gvolumemonitor.h b/gio/gvolumemonitor.h index 787d414ca..463d56ac3 100644 --- a/gio/gvolumemonitor.h +++ b/gio/gvolumemonitor.h @@ -21,6 +21,10 @@ * David Zeuthen */ +#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __G_VOLUME_MONITOR_H__ #define __G_VOLUME_MONITOR_H__ diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am index 0780fa278..36d920aac 100644 --- a/gio/inotify/Makefile.am +++ b/gio/inotify/Makefile.am @@ -32,5 +32,6 @@ libinotify_la_CFLAGS = \ -I$(top_srcdir)/gmodule \ -I$(top_srcdir)/gio \ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \ + -DGIO_COMPILATION \ -DG_DISABLE_DEPRECATED