[Bug [Bug 687705] Compile of 8.31 fails on OS/2] Compile of 8.31 fails on OS/2

"Russell Lang" <[email protected]> Tue, 28 Sep 2004 07:16:24 +1000

Newsgroups	gmane.comp.printing.ghostscript.patches
Message-ID	<41590FC8.22104.32E5C9CB@localhost>

I will commit this change without waiting for review.
I added -DHAVE_LONG_LONG to the OS/2 makefile because gxshade6.c 
now requires a 64-bit type.  Other platforms may have the same 
problem.  Previously a 64-bit type was only needed if gx_color_index 
was 64-bit.

Log Message:
Fix bug #687705 Compile of 8.31 fails on OS/2.

Russell Lang                   [email protected]
Ghostgum Software Pty Ltd      http://www.ghostgum.com.au/

_______________________________________________
gs-code-review mailing list
[email protected]
http://www.ghostscript.com/mailman/listinfo/gs-code-review

os2a.txt (application/octet-stream, 2.1 KB)

diff -u p:/data/src/gs/src/gdevos2p.c src/gdevos2p.c
--- p:/data/src/gs/src/gdevos2p.c	Fri Aug 13 10:09:44 2004
+++ src/gdevos2p.c	Mon Sep 27 21:42:52 2004
@@ -81,7 +81,7 @@
 private dev_proc_get_params(os2prn_get_params);
 
 private void os2prn_set_bpp(gx_device * dev, int depth);
-private int os2prn_get_queue_list(OS2QL * ql);
+private int os2prn_get_queue_list(gs_memory_t *mem, OS2QL * ql);
 private void os2prn_free_queue_list(gs_memory_t *mem, OS2QL * ql);
 int os2prn_get_printer(OS2QL * ql);
 
@@ -158,7 +158,7 @@
     opdev->hab = WinQueryAnchorBlock(hwndtext);
     opdev->newframe = 0;
 
-    if (os2prn_get_queue_list(&opdev->ql))
+    if (os2prn_get_queue_list(dev->memory, &opdev->ql))
 	return gs_error_limitcheck;
 
     if (opdev->queue_name[0] == '\0') {
diff -u p:/data/src/gs/src/gp_os2.c src/gp_os2.c
--- p:/data/src/gs/src/gp_os2.c	Tue Sep 14 16:45:56 2004
+++ src/gp_os2.c	Mon Sep 27 21:43:50 2004
@@ -153,7 +153,7 @@
 	return ((regs.h.dl & 0x80) != 0 && (regs.h.dl & 3) != 0);
     }
 #endif
-    if ((f == gs_stdin) || (f == gs_stdout) || (f == gs_stderr))
+    if (fileno(f) <= 2)
 	return true;
     return false;
 }
diff -u p:/data/src/gs/src/os2.mak src/os2.mak
--- p:/data/src/gs/src/os2.mak	Mon Sep 27 07:59:38 2004
+++ src/os2.mak	Mon Sep 27 21:42:20 2004
@@ -501,6 +501,7 @@
 DEVICE_DEVS18=$(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev $(DD)jetp3852.dev $(DD)r4081.dev
 DEVICE_DEVS19=$(DD)lbp8.dev $(DD)m8510.dev $(DD)necp6.dev $(DD)bjc600.dev $(DD)bjc800.dev
 DEVICE_DEVS20=$(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev
+DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
 
 # Include the generic makefiles.
 !include "$(GLSRCDIR)\version.mak"
@@ -568,7 +569,7 @@
 	-mkdir $(GLGENDIR)
 	-mkdir $(BINDIR)
 !if $(EMX)
-	$(CCAUX) -o $(AUXGEN)genarch $(GLSRCDIR)\genarch.c
+	$(CCAUX) -DHAVE_LONG_LONG -o $(AUXGEN)genarch $(GLSRCDIR)\genarch.c
 	$(COMPDIR)\emxbind $(EMXPATH)/bin/emxl.exe $(AUXGEN)genarch $(GENARCH_XE)
 	del $(AUXGEN)genarch
 !endif