[comp.windows.x] first patch to f2ps.c

envbvs@epb2.lbl.gov (Brian V. Smith) (02/21/90)

There had to be at least one mistake!
Here is a context diff for f2ps.c to rid it of it's dependency
on put_msg and CFREE/FREE.

*** f2ps.c.orig	Tue Feb 20 15:16:47 1990
--- f2ps.c	Tue Feb 20 15:15:25 1990
***************
*** 14,19
  #include "resources.h"
  #include "psfonts.h"
  
  #define		PAGE_WIDTH		612	/* points; 8.5" */
  #define		PAGE_HEIGHT		792	/* points; 11" */
  #define		POINT_PER_INCH		72

--- 14,22 -----
  #include "resources.h"
  #include "psfonts.h"
  
+ #undef cfree
+ #undef free
+ 
  #define		PAGE_WIDTH		612	/* points; 8.5" */
  #define		PAGE_HEIGHT		792	/* points; 11" */
  #define		POINT_PER_INCH		72
***************
*** 814,816
  
  	return(0);
  	}

--- 817,828 -----
  
  	return(0);
  	}
+ 
+ /*VARARGS1*/
+ put_msg(format, arg1, arg2, arg3, arg4, arg5)
+ 	char    *format;
+ 	int     arg1, arg2, arg3, arg4, arg5;
+ {
+ 	fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5);
+ }
+ 


_____________________________________
Brian V. Smith    (bvsmith@lbl.gov)
Lawrence Berkeley Laboratory
I don't speak for LBL, these non-opinions are all mine.

envbvs@epb2.lbl.gov (Brian V. Smith) (02/21/90)

Missed one thing for sparc machines.
Ignore the previously posted patch.

Here is the new, official patch1 for xfig 2.0.
(use patch -p < this_file)

---------------------------- cut here --------------------------------
*** f2ps.c.orig	Tue Feb 20 15:16:47 1990
--- f2ps.c	Tue Feb 20 15:51:24 1990
***************
*** 14,19
  #include "resources.h"
  #include "psfonts.h"
  
  #define		PAGE_WIDTH		612	/* points; 8.5" */
  #define		PAGE_HEIGHT		792	/* points; 11" */
  #define		POINT_PER_INCH		72

--- 14,22 -----
  #include "resources.h"
  #include "psfonts.h"
  
+ #undef cfree
+ #undef free
+ 
  #define		PAGE_WIDTH		612	/* points; 8.5" */
  #define		PAGE_HEIGHT		792	/* points; 11" */
  #define		POINT_PER_INCH		72
***************
*** 814,816
  
  	return(0);
  	}

--- 817,842 -----
  
  	return(0);
  	}
+ 
+ /*VARARGS1*/
+ put_msg(format, arg1, arg2, arg3, arg4, arg5)
+ 	char    *format;
+ 	int     arg1, arg2, arg3, arg4, arg5;
+ {
+ 	fprintf(stderr, format, arg1, arg2, arg3, arg4, arg5);
+ }
+ 
+ #ifdef sparc
+ 
+ FREE ( x )    /*-- disable free --*/
+     char *x ;
+ {
+     fprintf( stderr, "FREE -- %8x\n", x ) ;
+ }
+ CFREE ( x )   /*-- disable cfree --*/
+     char *x ;
+ {
+     fprintf( stderr, "FREE -- %8x\n", x ) ;
+ }
+ 
+ #endif  sparc
*** patchlevel.h.orig	Fri Feb 16 16:35:58 1990
--- patchlevel.h	Tue Feb 20 15:35:01 1990
***************
*** 1
! #define PATCHLEVEL 0

--- 1 -----
! #define PATCHLEVEL 1

_____________________________________
Brian V. Smith    (bvsmith@lbl.gov)
Lawrence Berkeley Laboratory
I don't speak for LBL, these non-opinions are all mine.