Mercurial > dwindows
changeset 1692:6e26c9ead2fe
Fixed a variety of warnings in different compiler/linker combinations on OS/2.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Tue, 01 May 2012 23:12:02 +0000 |
| parents | 0bf394615372 |
| children | b2311922a4de |
| files | makefile.emx makefile.vac os2/dw.c os2/dw.def os2/dwcompat.def |
| diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- 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;