ORBit2 r2101 - in trunk: . linc2 linc2/include/linc src/idl-compiler src/orb/orb-core src/orb/poa src/orb/util src/services/name

[cosimoc svn gnome org]

Author: cosimoc
Date: Fri Oct 17 19:49:48 2008
New Revision: 2101
URL: http://svn.gnome.org/viewvc/ORBit2?rev=2101&view=rev

Log:
2008-10-17  Cosimo Cecchi  <cosimoc gnome org>

	* configure.in:
	* src/idl-compiler/orbit-idl-main.c:
	* src/orb/orb-core/orbit-small.c:
	* src/orb/orb-core/orbit-typelib.c:
	* src/orb/poa/poa-macros.h:
	* src/orb/poa/poa-private.h:
	* src/orb/util/orbit-purify.h:
	* src/services/name/boot.c:
	Use and enforce single GLib includes.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/linc2/ChangeLog
   trunk/linc2/include/linc/linc-connection.h
   trunk/linc2/include/linc/linc-protocol.h
   trunk/linc2/include/linc/linc-server.h
   trunk/linc2/include/linc/linc-types.h
   trunk/src/idl-compiler/orbit-idl-main.c
   trunk/src/orb/orb-core/orbit-small.c
   trunk/src/orb/orb-core/orbit-typelib.c
   trunk/src/orb/poa/poa-macros.h
   trunk/src/orb/poa/poa-private.h
   trunk/src/orb/util/orbit-purify.h
   trunk/src/services/name/boot.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 17 19:49:48 2008
@@ -243,7 +243,7 @@
 AC_SUBST(pkglibdir)
 
 DISABLE_DEPRECATED_CFLAGS=" \
-	-DG_DISABLE_DEPRECATED"
+	-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
 AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
 
 

Modified: trunk/linc2/include/linc/linc-connection.h
==============================================================================
--- trunk/linc2/include/linc/linc-connection.h	(original)
+++ trunk/linc2/include/linc/linc-connection.h	Fri Oct 17 19:49:48 2008
@@ -12,7 +12,7 @@
 #ifndef _LINK_CONNECTION_H_
 #define _LINK_CONNECTION_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/linc2/include/linc/linc-protocol.h
==============================================================================
--- trunk/linc2/include/linc/linc-protocol.h	(original)
+++ trunk/linc2/include/linc/linc-protocol.h	Fri Oct 17 19:49:48 2008
@@ -12,7 +12,7 @@
 #ifndef _LINK_PROTOCOL_H_
 #define _LINK_PROTOCOL_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/linc2/include/linc/linc-server.h
==============================================================================
--- trunk/linc2/include/linc/linc-server.h	(original)
+++ trunk/linc2/include/linc/linc-server.h	Fri Oct 17 19:49:48 2008
@@ -12,7 +12,7 @@
 #ifndef _LINK_SERVER_H_
 #define _LINK_SERVER_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/linc2/include/linc/linc-types.h
==============================================================================
--- trunk/linc2/include/linc/linc-types.h	(original)
+++ trunk/linc2/include/linc/linc-types.h	Fri Oct 17 19:49:48 2008
@@ -12,8 +12,7 @@
 #ifndef _LINK_TYPES_H_
 #define _LINK_TYPES_H_
 
-#include <glib/gmacros.h>
-#include <glib/gthread.h>
+#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS

Modified: trunk/src/idl-compiler/orbit-idl-main.c
==============================================================================
--- trunk/src/idl-compiler/orbit-idl-main.c	(original)
+++ trunk/src/idl-compiler/orbit-idl-main.c	Fri Oct 17 19:49:48 2008
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <glib.h>
 #include <libIDL/IDL.h>
-#include <glib/goption.h>
 #include <glib/gi18n.h>
 
 #include "orbit-idl2.h"

Modified: trunk/src/orb/orb-core/orbit-small.c
==============================================================================
--- trunk/src/orb/orb-core/orbit-small.c	(original)
+++ trunk/src/orb/orb-core/orbit-small.c	Fri Oct 17 19:49:48 2008
@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include <gmodule.h>
-#include <glib/garray.h>
+#include <glib.h>
 
 #include <orbit/orbit.h>
 

Modified: trunk/src/orb/orb-core/orbit-typelib.c
==============================================================================
--- trunk/src/orb/orb-core/orbit-typelib.c	(original)
+++ trunk/src/orb/orb-core/orbit-typelib.c	Fri Oct 17 19:49:48 2008
@@ -4,7 +4,7 @@
 
 #include <orbit/orbit.h>
 #include <gmodule.h>
-#include <glib/garray.h>
+#include <glib.h>
 
 #include "orb-core-private.h"
 #include "orbit-debug.h"

Modified: trunk/src/orb/poa/poa-macros.h
==============================================================================
--- trunk/src/orb/poa/poa-macros.h	(original)
+++ trunk/src/orb/poa/poa-macros.h	Fri Oct 17 19:49:48 2008
@@ -1,7 +1,7 @@
 #ifndef __POA_MACROS_H__
 #define __POA_MACROS_H__
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/orb/poa/poa-private.h
==============================================================================
--- trunk/src/orb/poa/poa-private.h	(original)
+++ trunk/src/orb/poa/poa-private.h	Fri Oct 17 19:49:48 2008
@@ -1,7 +1,7 @@
 #ifndef _POA_PRIVATE_H_
 #define _POA_PRIVATE_H_
 
-#include <glib/gthread.h>
+#include <glib.h>
 
 extern GMutex *_ORBit_poa_manager_lock;
 

Modified: trunk/src/orb/util/orbit-purify.h
==============================================================================
--- trunk/src/orb/util/orbit-purify.h	(original)
+++ trunk/src/orb/util/orbit-purify.h	Fri Oct 17 19:49:48 2008
@@ -2,7 +2,7 @@
 #define _ORBIT_PURIFY_H 1
 
 #include <string.h>
-#include <glib/gmacros.h>
+#include <glib.h>
 
 #ifdef ORBIT_PURIFY
 #  define p_memwipe(m,len)	memset ((m), 0xaa, (len))

Modified: trunk/src/services/name/boot.c
==============================================================================
--- trunk/src/services/name/boot.c	(original)
+++ trunk/src/services/name/boot.c	Fri Oct 17 19:49:48 2008
@@ -6,7 +6,7 @@
 #  include <syslog.h>
 #endif
 #include <signal.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 #include "CosNaming_impl.h"