two fixes for MacOS X

Patch:    ivtools-021116-johnston-075
For:      ivtools-1.0.6
Author:   [email protected]
Subject:  two fixes for MacOS X
Requires:

This is an intermediate patch to ivtools-1.0.6.  To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:

         patch -p0 <ThisFile

Summary of Changes:

- disable use of X11 shared memory extension for MacOS X.  This may
only be a problem with 10.1, or only be a problem with XFree86 4.2, so
it may be reinstated in the future.

- customize iostream include files for MacOS X Jaguar (10.2), to mask
the difference between Apple's version of gcc-3.1 libstdc++ and
everyone elses.  This is untested, so let me know if it worked for you.

Index: include_std/fstream.h
diff -c include_std/fstream.h:1.1 include_std/fstream.h:1.2
*** include_std/fstream.h:1.1   Fri Sep 13 09:53:15 2002
--- src/include/ivstd/fstream.h Sat Nov 16 09:02:32 2002
***************
*** 4,10 ****
   #if __GNUC__>=3
   #define input ios_base::in
   #define output ios_base::out
! #if __GNUC__>3 || __GNUC__==3 && __GNUC_MINOR__>0
   #include <ext/stdio_filebuf.h>
   #define fileptr_filebuf __gnu_cxx::stdio_filebuf<char>
   #else
--- 4,10 ----
   #if __GNUC__>=3
   #define input ios_base::in
   #define output ios_base::out
! #if __GNUC__>3 || __GNUC__==3 && __GNUC_MINOR__>0 && !defined(__APPLE__)
   #include <ext/stdio_filebuf.h>
   #define fileptr_filebuf __gnu_cxx::stdio_filebuf<char>
   #else
Index: include_x11/xraster.h
diff -c include_x11/xraster.h:1.1 include_x11/xraster.h:1.2
*** include_x11/xraster.h:1.1   Fri Sep 13 09:52:25 2002
--- src/include/IV-X11/xraster.h        Sat Nov 16 09:02:25 2002
***************
*** 30,36 ****
   #define iv_xraster_h

   // should be defined externally
! #if !defined(__CYGWIN__)
   #define XSHM
   #endif

--- 30,36 ----
   #define iv_xraster_h

   // should be defined externally
! #if !defined(__CYGWIN__)&&!defined(__APPLE__)
   #define XSHM
   #endif

*** /dev/null    Sat Nov 16 09:02:41 PST 2002
--- patches/ivtools-021116-johnston-075
*************** patches/ivtools-021116-johnston-075
*** 0 ****
--- 1 ----
+ ivtools-021116-johnston-075


-------------------------------------------------------
This SF.net email is sponsored by: Get the new Palm Tungsten T 
handheld. Power & Color in a compact size! 
http://ads.sourceforge.net/cgi-bin/redirect.pl?palm0002en