From 0989cfae25fd7340e1eb1e1c292bfb501feedb67 Mon Sep 17 00:00:00 2001
From: Robert Lunnon <bobl@optushome.com.au>
Date: Thu, 27 Oct 2005 12:24:42 +0000
Subject: [PATCH] Reorder header files to avoid name space collision with
 symbol PAGESIZE.

---
 dlls/wineps/init.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/dlls/wineps/init.c b/dlls/wineps/init.c
index f836baea181..8d8305a52f5 100644
--- a/dlls/wineps/init.c
+++ b/dlls/wineps/init.c
@@ -26,26 +26,28 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#ifdef HAVE_CUPS_CUPS_H
+# include <cups/cups.h>
+#endif
 
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
-#include "psdrv.h"
+
 #include "wine/debug.h"
-#include "winreg.h"
-#include "winspool.h"
 #include "winerror.h"
 #include "wownt32.h"
 #include "heap.h"
+#include "winreg.h"
+#include "psdrv.h"
+#include "winspool.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
-#ifdef HAVE_CUPS_CUPS_H
-#include <cups/cups.h>
-
 #ifndef SONAME_LIBCUPS
 #define SONAME_LIBCUPS "libcups.so"
 #endif
 
+#ifdef HAVE_CUPS_CUPS_H
 static void *cupshandle = NULL;
 #endif