[Gnome-print] gnome-print fixes for MacOS X / Darwin



Can I commit?

Oops, the ChangeLog entry for gf-pfb.c didn't end up in the diff. It's
basically just that we're moving the <sys/types.h> include to before
the <sys/mman.h> one, because Darwin's sys/ headers aren't very
robust.

The PCL stuff is because ANSI doesn't define what happens when you
define the same symbol non-statically in multiple source files.

Index: installer/gf-pfb.c
===================================================================
RCS file: /cvs/gnome/gnome-print/installer/gf-pfb.c,v
retrieving revision 1.1
diff -u -r1.1 gf-pfb.c
--- installer/gf-pfb.c	2000/11/17 02:22:10	1.1
+++ installer/gf-pfb.c	2001/04/03 19:29:11
@@ -4,8 +4,8 @@
  * fixme: We should relly do some parsing here
  */
 
-#include <sys/mman.h>
 #include <sys/types.h>
+#include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
Index: libgnomeprint/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-print/libgnomeprint/ChangeLog,v
retrieving revision 1.249.2.19
diff -u -r1.249.2.19 ChangeLog
--- libgnomeprint/ChangeLog	2001/03/19 02:49:45	1.249.2.19
+++ libgnomeprint/ChangeLog	2001/04/03 19:29:12
@@ -1,3 +1,12 @@
+2001-04-03  Dan Winship  <danw@ximian.com>
+
+	* gnome-print-pclv.c: Remove reference to jobdata.
+
+	* gnome-print-pclr.c: Ditto.
+
+	* gnome-print-pclc.c: Add it here. (So it's only declared non-extern
+	in one place.)
+
 2001-03-18  Chema Celorio  <chema@celorio.com>
 
 	* gnome-printer.c (gnome_printer_finalize): remove a g_print
Index: libgnomeprint/gnome-print-pclc.c
===================================================================
RCS file: /cvs/gnome/gnome-print/libgnomeprint/gnome-print-pclc.c,v
retrieving revision 1.1
diff -u -r1.1 gnome-print-pclc.c
--- libgnomeprint/gnome-print-pclc.c	2000/07/22 19:59:09	1.1
+++ libgnomeprint/gnome-print-pclc.c	2001/04/03 19:29:12
@@ -16,6 +16,8 @@
 4.  The application and the print dialog will load the
     job specific parameters */
 
+PCLJobData * jobdata;
+
 void
 pclc_new_job_data (void)
 {
Index: libgnomeprint/gnome-print-pclr.c
===================================================================
RCS file: /cvs/gnome/gnome-print/libgnomeprint/gnome-print-pclr.c,v
retrieving revision 1.24
diff -u -r1.24 gnome-print-pclr.c
--- libgnomeprint/gnome-print-pclr.c	2000/12/18 21:38:50	1.24
+++ libgnomeprint/gnome-print-pclr.c	2001/04/03 19:29:12
@@ -62,7 +62,6 @@
 #include <libgnomeprint/gnome-print-encode.h>
 #include <libgnomeprint/gnome-print-encode-private.h>
 
-PCLJobData * jobdata;
 static GnomePrintRGBPClass *pclr_parent_class;
 
 static int
Index: libgnomeprint/gnome-print-pclv.c
===================================================================
RCS file: /cvs/gnome/gnome-print/libgnomeprint/gnome-print-pclv.c,v
retrieving revision 1.6
diff -u -r1.6 gnome-print-pclv.c
--- libgnomeprint/gnome-print-pclv.c	2000/12/05 04:07:08	1.6
+++ libgnomeprint/gnome-print-pclv.c	2001/04/03 19:29:12
@@ -53,7 +53,6 @@
 #include <libgnomeprint/gnome-print-pclc.h>
 #include <libgnomeprint/gnome-print-encode-private.h>
 
-PCLJobData * jobdata;
 static GnomePrintRGBPClass *pclv_parent_class;
 
 static int




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]