wineps: Define PSDRV_DEVMODE in unixlib.h.

dlls/wineps.drv/builtin.c

@@ -31,7 +31,6 @@
 #include "winternl.h"
 
 #include "psdrv.h"
-#include "unixlib.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(psdrv);

dlls/wineps.drv/font.c

@@ -30,7 +30,6 @@
 #include "winternl.h"
 
 #include "psdrv.h"
-#include "unixlib.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(psdrv);

dlls/wineps.drv/init.c

@@ -31,7 +31,6 @@
 #include "psdrv.h"
 #include "ddk/winddi.h"
 #include "ntf.h"
-#include "unixlib.h"
 #include "winspool.h"
 #include "wine/debug.h"
 

dlls/wineps.drv/psdrv.h

@@ -28,6 +28,8 @@
 #include "wingdi.h"
 #include "winspool.h"
 
+#include "unixlib.h"
+
 #include "wine/gdi_driver.h"
 #include "wine/list.h"
 
@@ -210,19 +212,6 @@ typedef struct {
     DUPLEX              *DefaultDuplex;
 } PPD;
 
-typedef struct {
-    DEVMODEW dmPublic;
-    int default_resolution;
-    int landscape_orientation;
-    int duplex;
-    int input_slots;
-    int resolutions;
-    int page_sizes;
-    int font_subs;
-    int installed_fonts;
-    BYTE data[1];
-} PSDRV_DEVMODE;
-
 typedef struct
 {
     struct list             entry;
@@ -554,7 +543,6 @@ extern void passthrough_leave(print_ctx *ctx) DECLSPEC_HIDDEN;
 	setlocale(LC_NUMERIC,tmplocale);			\
 } while (0)
 
-#ifndef WINE_UNIX_LIB
 static inline WCHAR *strdupW( const WCHAR *str )
 {
     int size;
@@ -566,6 +554,5 @@ static inline WCHAR *strdupW( const WCHAR *str )
     if (ret) memcpy( ret, str, size );
     return ret;
 }
-#endif
 
 #endif

dlls/wineps.drv/unixlib.c

@@ -32,7 +32,6 @@
 #include "winbase.h"
 
 #include "ntf.h"
-#include "psdrv.h"
 #include "unixlib.h"
 #include "ntgdi.h"
 #include "ddk/winddi.h"

dlls/wineps.drv/unixlib.h

@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#ifndef __PSDRV_UNIXLIB_H
+#define __PSDRV_UNIXLIB_H
+
 #include "ntuser.h"
 #include "wine/unixlib.h"
 
@@ -71,6 +74,19 @@ struct installed_font
     char name[LF_FACESIZE];
 };
 
+typedef struct {
+    DEVMODEW dmPublic;
+    int default_resolution;
+    int landscape_orientation;
+    int duplex;
+    int input_slots;
+    int resolutions;
+    int page_sizes;
+    int font_subs;
+    int installed_fonts;
+    BYTE data[1];
+} PSDRV_DEVMODE;
+
 /* Unix calls */
 enum wineps_funcs
 {
@@ -94,3 +110,5 @@ struct open_dc_params
     PSDRV_DEVMODE *def_devmode;
     HDC hdc;
 };
+
+#endif