evolution-data-server r8406 - trunk/camel

[tml svn gnome org]

Author: tml
Date: Wed Jan 23 02:58:58 2008
New Revision: 8406
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8406&view=rev

Log:
2008-01-23  Tor Lillqvist  <tml novell com>

	* camel-net-utils.c
	* camel-filter-driver.c
	* camel-filter-search.c
	* camel-gpg-context.c: Include GLib headers before testing G_OS_WIN32.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-filter-driver.c
   trunk/camel/camel-filter-search.c
   trunk/camel/camel-gpg-context.c
   trunk/camel/camel-net-utils.c

Modified: trunk/camel/camel-filter-driver.c
==============================================================================
--- trunk/camel/camel-filter-driver.c	(original)
+++ trunk/camel/camel-filter-driver.c	Wed Jan 23 02:58:58 2008
@@ -31,14 +31,14 @@
 #include <sys/types.h>
 #include <time.h>
 
-#ifndef G_OS_WIN32
-#include <sys/wait.h>
-#endif
-
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
+#ifndef G_OS_WIN32
+#include <sys/wait.h>
+#endif
+
 #include <libedataserver/e-sexp.h>
 #include <libedataserver/e-memory.h>
 #include <libedataserver/e-msgport.h>

Modified: trunk/camel/camel-filter-search.c
==============================================================================
--- trunk/camel/camel-filter-search.c	(original)
+++ trunk/camel/camel-filter-search.c	Wed Jan 23 02:58:58 2008
@@ -38,13 +38,13 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
 #ifndef G_OS_WIN32
 #include <sys/wait.h>
 #endif
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
 #include <libedataserver/e-iconv.h>
 #include <libedataserver/e-sexp.h>
 

Modified: trunk/camel/camel-gpg-context.c
==============================================================================
--- trunk/camel/camel-gpg-context.c	(original)
+++ trunk/camel/camel-gpg-context.c	Wed Jan 23 02:58:58 2008
@@ -42,6 +42,10 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
+
 #ifndef G_OS_WIN32
 #include <sys/ioctl.h>
 #include <sys/poll.h>
@@ -49,10 +53,6 @@
 #include <termios.h>
 #endif
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <glib/gstdio.h>
-
 #include <libedataserver/e-iconv.h>
 
 #include "camel-debug.h"

Modified: trunk/camel/camel-net-utils.c
==============================================================================
--- trunk/camel/camel-net-utils.c	(original)
+++ trunk/camel/camel-net-utils.c	Wed Jan 23 02:58:58 2008
@@ -29,13 +29,13 @@
 #include <pthread.h>
 #include <stdio.h>
 
+#include <glib.h>
+#include <glib/gi18n-lib.h>
+
 #ifndef G_OS_WIN32
 #include <sys/poll.h>
 #endif
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
 #include <libedataserver/e-msgport.h>
 
 #include "camel-exception.h"