# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1335913922 0
# Node ID 6e26c9ead2fef451dd6b5b0ae449f71f2649c1a1
# Parent  0bf3946153721cce98aacaecd998f4d60e78db06
Fixed a variety of warnings in different compiler/linker combinations on OS/2.

diff -r 0bf394615372 -r 6e26c9ead2fe makefile.emx
--- a/makefile.emx	Mon Apr 30 22:11:33 2012 +0000
+++ b/makefile.emx	Tue May 01 23:12:02 2012 +0000
@@ -43,7 +43,7 @@
 	copy dwcompat.lib lib
 
 dwtest.exe: dwtest.o dw.lib dwcompat.lib
-	$(CC) $(CFLAGS) -Zomf -Zmt -static-libgcc -o dwtest.exe dwtest.o -Llib -ldw -ldwcompat os2/dwtest.def
+	$(CC) $(CFLAGS) -Zomf -Zmt -static-libgcc -Zlinker /pm:pm -o dwtest.exe dwtest.o -Llib -ldw -ldwcompat os2/dwtest.def
 
 clean:
 	$(RM) *.obj *.o *.lib *.res *~ dwtest.exe dw.dll dwcompat.dll SVN.REV
diff -r 0bf394615372 -r 6e26c9ead2fe makefile.vac
--- a/makefile.vac	Mon Apr 30 22:11:33 2012 +0000
+++ b/makefile.vac	Tue May 01 23:12:02 2012 +0000
@@ -46,7 +46,7 @@
 	icc /Ti /DOS2 /DTCPV40HDRS /Sp1 /I. /Sm /Ss /Q /Gm /Gt /C dwtest.c
 dwtest.exe:  dwtest.obj
 	icc @<<
-	 /B" /DE /optfunc"
+	 /B" /DE /optfunc /pm:pm"
 	 /Fedwtest.exe
 	 lib\dw.lib lib\dwcompat.lib
 	 dwtest.obj
diff -r 0bf394615372 -r 6e26c9ead2fe os2/dw.c
--- a/os2/dw.c	Mon Apr 30 22:11:33 2012 +0000
+++ b/os2/dw.c	Tue May 01 23:12:02 2012 +0000
@@ -1513,7 +1513,7 @@
     if(WinQueryPresParam(hWnd, PP_FOREGROUNDCOLOR, 0, NULL, sizeof(fcolor), &fcolor, QPF_NOINHERIT) ||
        WinQueryPresParam(hWnd, PP_FOREGROUNDCOLORINDEX, 0, NULL, sizeof(fcolor), &fcolor, QPF_NOINHERIT))
         GpiSetColor(hpsPaint, fcolor);
-    WinDrawText(hpsPaint, -1, tempbuf, &rclPaint, DT_TEXTATTRS, DT_TEXTATTRS, style | DT_TEXTATTRS | DT_ERASERECT);
+    WinDrawText(hpsPaint, -1, (PCH)tempbuf, &rclPaint, DT_TEXTATTRS, DT_TEXTATTRS, style | DT_TEXTATTRS | DT_ERASERECT);
 }
 
 /* Function: BubbleProc
@@ -11638,7 +11638,11 @@
 int API dw_exec(char *program, int type, char **params)
 {
    type = type; /* keep compiler happy */
+#ifdef __EMX__
    return spawnvp(P_NOWAIT, program, (char * const *)params);
+#else
+   return spawnvp(P_NOWAIT, program, (const char * const *)params);
+#endif
 }
 
 /*
@@ -11764,7 +11768,7 @@
 {
     HDC hdc;
     char *printername;
-    int (* API drawfunc)(HPRINT, HPIXMAP, int, void *);
+    int (API_FUNC drawfunc)(HPRINT, HPIXMAP, int, void *);
     void *drawdata;
     unsigned long flags;
     unsigned int startpage, endpage;
@@ -11881,7 +11885,7 @@
     if(!drawfunc || !(print = calloc(1, sizeof(DWPrint))))
         return NULL;
     
-    print->drawfunc = drawfunc;
+    print->drawfunc = (int (API_FUNC)(HPRINT, HPIXMAP, int, void *))drawfunc;
     print->drawdata = drawdata;
     print->jobname = jobname ? jobname : "Dynamic Windows Print Job";
     print->startpage = 1;
diff -r 0bf394615372 -r 6e26c9ead2fe os2/dw.def
--- a/os2/dw.def	Mon Apr 30 22:11:33 2012 +0000
+++ b/os2/dw.def	Tue May 01 23:12:02 2012 +0000
@@ -1,7 +1,5 @@
 LIBRARY DW INITINSTANCE TERMINSTANCE
 
-PROTMODE
-
 DESCRIPTION 'Dynamic Windows for OS/2'
 
 CODE LOADONCALL
diff -r 0bf394615372 -r 6e26c9ead2fe os2/dwcompat.def
--- a/os2/dwcompat.def	Mon Apr 30 22:11:33 2012 +0000
+++ b/os2/dwcompat.def	Tue May 01 23:12:02 2012 +0000
@@ -1,7 +1,5 @@
 LIBRARY DWCOMPAT INITINSTANCE TERMINSTANCE
 
-PROTMODE
-
 DESCRIPTION 'Dynamic Windows Compatibility Module for OS/2'
 
 CODE LOADONCALL