"fix up compiling with ACE using < gcc-3.*"

Patch:    ivtools-020729-johnston-060
For:      ivtools-1.0.4
Author:   [email protected]
Subject:  fix up compiling with ACE using < gcc-3.*
Requires: 

This is an intermediate patch to ivtools-1.0.4.  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:

- fix up compiling with ACE using less than gcc-3.*

Index: src_iv/Imakefile
diff -c src_iv/Imakefile:1.2 src_iv/Imakefile:1.3
*** src_iv/Imakefile:1.2	Mon Jan 14 16:28:11 2002
--- src/IV/Imakefile	Mon Jul 29 17:44:59 2002
***************
*** 195,201 ****
  DispatchObj(iohandler)
  #if BuildRPCClasses
  DispatchObj(iostreamb)
! DispatchObj(rpcbuf)
  DispatchObj(rpchdr)
  DispatchObj(rpcpeer)
  DispatchObj(rpcreader)
--- 195,201 ----
  DispatchObj(iohandler)
  #if BuildRPCClasses
  DispatchObj(iostreamb)
! DispatchObjFlags(rpcbuf,-DSOCKLEN_T_DEFINED=$(SOCKLEN_T_DEFINED))
  DispatchObj(rpchdr)
  DispatchObj(rpcpeer)
  DispatchObj(rpcreader)
Index: src_dispatch/rpcbuf.c
diff -c src_dispatch/rpcbuf.c:1.2 src_dispatch/rpcbuf.c:1.3
*** src_dispatch/rpcbuf.c:1.2	Wed Feb 20 11:53:32 2002
--- src/Dispatch/rpcbuf.c	Mon Jul 29 17:45:01 2002
***************
*** 55,60 ****
--- 55,64 ----
  }
  #endif
  
+ #if !defined(SOCKLEN_T_DEFINED) || !SOCKLEN_T_DEFINED
+ typedef int socklen_t;
+ #endif
+ 
  // I need a pointer to an iostreamb so I can insert and extract values
  // in the length field of RPC requests.  If I don't have a stream, I
  // won't allow you to call start_request().
Index: AttrGlyph/attredit.c
diff -c AttrGlyph/attredit.c:1.1 AttrGlyph/attredit.c:1.2
*** AttrGlyph/attredit.c:1.1	Fri Nov  2 13:06:38 2001
--- src/AttrGlyph/attredit.c	Mon Jul 29 17:45:06 2002
***************
*** 43,49 ****
  
  #include <strstream.h>
  #include <string.h>
! #if defined(LibStdCPlusPlus2) || defined(LibStdCPlusPlus3)
  #define STL_VECTOR
  #include <vector.h>
  #endif
--- 43,50 ----
  
  #include <strstream.h>
  #include <string.h>
! #if __GNUC__==2 && __GNUC_MINOR__<=7
! #else
  #define STL_VECTOR
  #include <vector.h>
  #endif
Index: OverlayUnidraw/aceimport.h
diff -c OverlayUnidraw/aceimport.h:1.3 OverlayUnidraw/aceimport.h:1.4
*** OverlayUnidraw/aceimport.h:1.3	Wed Jul 24 15:25:09 2002
--- src/OverlayUnidraw/aceimport.h	Mon Jul 29 17:45:08 2002
***************
*** 64,70 ****
    // host we are connected to.
  
    OvImportCmd* _import_cmd; // associated import command
!   fileptr_filebuf* _filebuf;        // associated input buffer
    istream* _inptr;          // associated input stream
    FILE* _infptr;            // associated FILE*
  };
--- 64,74 ----
    // host we are connected to.
  
    OvImportCmd* _import_cmd; // associated import command
! #if __GNUG__<3
!   filebuf* _filebuf;
! #else				 
!   fileptr_filebuf* _filebuf;        // associated input buffer#
! #endif
    istream* _inptr;          // associated input stream
    FILE* _infptr;            // associated FILE*
  };
*** /dev/null	 Mon Jul 29 17:45:14 PDT 2002
--- patches/ivtools-020729-johnston-060
*************** patches/ivtools-020729-johnston-060
*** 0 ****
--- 1 ----
+ ivtools-020729-johnston-060


-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31