"fixes for compiling with gcc-3.2 using ACE"
[email protected] Thu, 05 Sep 2002 16:22:26 -0700
| Newsgroups | gmane.comp.lib.ivtools.patches |
|---|---|
| Message-ID | <[email protected]> |
Patch: ivtools-020905-johnston-065 For: ivtools-1.0.6 Author: [email protected] Subject: fixes for compiling with gcc-3.2 using ACE 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: - fixes for compiling with gcc-3.2 using ACE (on RedHat 6.2) Index: ComTerp/comterp.c diff -c ComTerp/comterp.c:1.7 ComTerp/comterp.c:1.8 *** ComTerp/comterp.c:1.7 Fri Aug 2 11:34:29 2002 --- src/ComTerp/comterp.c Thu Sep 5 16:15:15 2002 *************** *** 23,28 **** --- 23,30 ---- * */ + #include <ComTerp/comhandler.h> + #include <ComTerp/_comterp.h> #include <ComTerp/_comutil.h> #include <ComTerp/assignfunc.h> *************** *** 30,36 **** #include <ComTerp/boolfunc.h> #include <ComTerp/bquotefunc.h> #include <ComTerp/comfunc.h> - #include <ComTerp/comhandler.h> #include <ComTerp/comterp.h> #include <ComTerp/comterpserv.h> #include <ComTerp/comvalue.h> --- 32,37 ---- Index: ComTerp/comterpserv.c diff -c ComTerp/comterpserv.c:1.3 ComTerp/comterpserv.c:1.4 *** ComTerp/comterpserv.c:1.3 Fri Aug 2 11:34:29 2002 --- src/ComTerp/comterpserv.c Thu Sep 5 16:15:15 2002 *************** *** 22,30 **** * */ #include <ComTerp/_comterp.h> #include <ComTerp/_comutil.h> - #include <ComTerp/comhandler.h> #include <ComTerp/comterpserv.h> #include <ComTerp/comvalue.h> #include <ComTerp/ctrlfunc.h> --- 22,31 ---- * */ + #include <ComTerp/comhandler.h> + #include <ComTerp/_comterp.h> #include <ComTerp/_comutil.h> #include <ComTerp/comterpserv.h> #include <ComTerp/comvalue.h> #include <ComTerp/ctrlfunc.h> Index: ComTerp/ctrlfunc.c diff -c ComTerp/ctrlfunc.c:1.4 ComTerp/ctrlfunc.c:1.5 *** ComTerp/ctrlfunc.c:1.4 Fri Aug 2 11:34:29 2002 --- src/ComTerp/ctrlfunc.c Thu Sep 5 16:15:15 2002 *************** *** 21,30 **** * */ - #include <ComTerp/ctrlfunc.h> #include <ComTerp/comhandler.h> ! #include <ComTerp/comvalue.h> #include <ComTerp/comterpserv.h> #include <Attribute/attrlist.h> #include <fstream.h> --- 21,31 ---- * */ #include <ComTerp/comhandler.h> ! ! #include <ComTerp/ctrlfunc.h> #include <ComTerp/comterpserv.h> + #include <ComTerp/comvalue.h> #include <Attribute/attrlist.h> #include <fstream.h> Index: ComTerp/debugfunc.c diff -c ComTerp/debugfunc.c:1.4 ComTerp/debugfunc.c:1.5 *** ComTerp/debugfunc.c:1.4 Fri Aug 2 11:34:29 2002 --- src/ComTerp/debugfunc.c Thu Sep 5 16:15:15 2002 *************** *** 23,28 **** --- 23,29 ---- */ #include <ComTerp/comhandler.h> + #include <ComTerp/debugfunc.h> #include <ComTerp/comterpserv.h> #include <strstream.h> Index: ComTerp/helpfunc.c diff -c ComTerp/helpfunc.c:1.3 ComTerp/helpfunc.c:1.4 *** ComTerp/helpfunc.c:1.3 Fri Aug 2 11:34:29 2002 --- src/ComTerp/helpfunc.c Thu Sep 5 16:15:15 2002 *************** *** 22,31 **** * */ - #include <ComTerp/helpfunc.h> #include <ComTerp/comhandler.h> ! #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> #include <Attribute/attrlist.h> #include <Attribute/attrvalue.h> --- 22,32 ---- * */ #include <ComTerp/comhandler.h> ! ! #include <ComTerp/helpfunc.h> #include <ComTerp/comterp.h> + #include <ComTerp/comvalue.h> #include <Attribute/attrlist.h> #include <Attribute/attrvalue.h> Index: ComTerp/iofunc.c diff -c ComTerp/iofunc.c:1.3 ComTerp/iofunc.c:1.4 *** ComTerp/iofunc.c:1.3 Fri Aug 2 11:34:29 2002 --- src/ComTerp/iofunc.c Thu Sep 5 16:15:15 2002 *************** *** 22,29 **** * */ - #include <ComTerp/iofunc.h> #include <ComTerp/comhandler.h> #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> #include <Attribute/aliterator.h> --- 22,30 ---- * */ #include <ComTerp/comhandler.h> + + #include <ComTerp/iofunc.h> #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> #include <Attribute/aliterator.h> Index: ComTerp/postfunc.c diff -c ComTerp/postfunc.c:1.3 ComTerp/postfunc.c:1.4 *** ComTerp/postfunc.c:1.3 Fri Aug 2 11:34:29 2002 --- src/ComTerp/postfunc.c Thu Sep 5 16:15:15 2002 *************** *** 22,29 **** * */ - #include <ComTerp/postfunc.h> #include <ComTerp/comhandler.h> #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> --- 22,30 ---- * */ #include <ComTerp/comhandler.h> + + #include <ComTerp/postfunc.h> #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> Index: ComTerp/symbolfunc.c diff -c ComTerp/symbolfunc.c:1.2 ComTerp/symbolfunc.c:1.3 *** ComTerp/symbolfunc.c:1.2 Thu Aug 1 11:39:29 2002 --- src/ComTerp/symbolfunc.c Thu Sep 5 16:15:15 2002 *************** *** 22,29 **** * */ - #include <ComTerp/symbolfunc.h> #include <ComTerp/comhandler.h> #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> --- 22,30 ---- * */ #include <ComTerp/comhandler.h> + + #include <ComTerp/symbolfunc.h> #include <ComTerp/comvalue.h> #include <ComTerp/comterp.h> Index: comterp/main.c diff -c comterp/main.c:1.3 comterp/main.c:1.4 *** comterp/main.c:1.3 Fri Aug 2 11:34:32 2002 --- src/comterp_/main.c Thu Sep 5 16:15:17 2002 *************** *** 21,28 **** * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - #include <ComTerp/comterpserv.h> - #ifdef HAVE_ACE #include <ComTerp/comhandler.h> #include <ace/SOCK_Connector.h> --- 21,26 ---- *************** *** 31,36 **** --- 29,37 ---- static u_short SERVER_PORT = 20000; static const char *const SERVER_HOST = ACE_DEFAULT_SERVER_HOST; #endif + + #include <ComTerp/comterpserv.h> + #include <fstream.h> Index: OverlayUnidraw/aceimport.c diff -c OverlayUnidraw/aceimport.c:1.3 OverlayUnidraw/aceimport.c:1.4 *** OverlayUnidraw/aceimport.c:1.3 Fri Aug 2 11:35:24 2002 --- src/OverlayUnidraw/aceimport.c Thu Sep 5 16:15:37 2002 *************** *** 23,30 **** #ifdef HAVE_ACE - #include <OverlayUnidraw/oved.h> #include <OverlayUnidraw/aceimport.h> #include <OverlayUnidraw/ovcomps.h> #include <OverlayUnidraw/ovimport.h> #include <IVGlyph/importchooser.h> --- 23,31 ---- #ifdef HAVE_ACE #include <OverlayUnidraw/aceimport.h> + + #include <OverlayUnidraw/oved.h> #include <OverlayUnidraw/ovcomps.h> #include <OverlayUnidraw/ovimport.h> #include <IVGlyph/importchooser.h> Index: drawtool/main.c diff -c drawtool/main.c:1.4 drawtool/main.c:1.5 *** drawtool/main.c:1.4 Fri Jun 28 12:46:38 2002 --- src/drawtool/main.c Thu Sep 5 16:15:39 2002 *************** *** 29,34 **** --- 29,39 ---- */ + #ifdef HAVE_ACE + #include <OverlayUnidraw/aceimport.h> + #include <AceDispatch/ace_dispatcher.h> + #endif + #include <OverlayUnidraw/ovcatalog.h> #include <OverlayUnidraw/ovcreator.h> #include <OverlayUnidraw/oved.h> *************** *** 38,48 **** #include <InterViews/world.h> #include <InterViews/event.h> - - #ifdef HAVE_ACE - #include <OverlayUnidraw/aceimport.h> - #include <AceDispatch/ace_dispatcher.h> - #endif #include <stream.h> #include <string.h> --- 43,48 ---- Index: ComUnidraw/comterp-acehandler.c diff -c ComUnidraw/comterp-acehandler.c:1.1 ComUnidraw/comterp-acehandler.c:1.2 *** ComUnidraw/comterp-acehandler.c:1.1 Fri Nov 2 13:07:06 2001 --- src/ComUnidraw/comterp-acehandler.c Thu Sep 5 16:15:40 2002 *************** *** 23,30 **** #ifdef HAVE_ACE - #include <ComUnidraw/comeditor.h> #include <ComUnidraw/comterp-acehandler.h> #include <ComTerp/comterpserv.h> #include <Unidraw/iterator.h> --- 23,31 ---- #ifdef HAVE_ACE #include <ComUnidraw/comterp-acehandler.h> + + #include <ComUnidraw/comeditor.h> #include <ComTerp/comterpserv.h> #include <Unidraw/iterator.h> Index: ComUnidraw/unifunc.c diff -c ComUnidraw/unifunc.c:1.6 ComUnidraw/unifunc.c:1.7 *** ComUnidraw/unifunc.c:1.6 Fri Aug 2 11:35:30 2002 --- src/ComUnidraw/unifunc.c Thu Sep 5 16:15:40 2002 *************** *** 22,27 **** --- 22,32 ---- * */ + #ifdef HAVE_ACE + #include <ComTerp/comhandler.h> + #include <ace/SOCK_Connector.h> + #endif + #include <ComUnidraw/comeditor.h> #include <ComUnidraw/unifunc.h> #include <OverlayUnidraw/ovcatalog.h> *************** *** 57,67 **** #include <fstream.h> #endif #include <string.h> - - #ifdef HAVE_ACE - #include <ComTerp/comhandler.h> - #include <ace/SOCK_Connector.h> - #endif #define TITLE "UnidrawFunc" --- 62,67 ---- Index: comdraw/main.c diff -c comdraw/main.c:1.5 comdraw/main.c:1.6 *** comdraw/main.c:1.5 Tue Feb 19 16:18:21 2002 --- src/comdraw/main.c Thu Sep 5 16:15:42 2002 *************** *** 26,31 **** --- 26,37 ---- * comdraw main program. */ + #ifdef HAVE_ACE + #include <ComUnidraw/comterp-acehandler.h> + #include <OverlayUnidraw/aceimport.h> + #include <AceDispatch/ace_dispatcher.h> + #endif + #include <OverlayUnidraw/ovcatalog.h> #include <OverlayUnidraw/ovcreator.h> #include <ComUnidraw/comeditor.h> *************** *** 39,50 **** #include <Unidraw/iterator.h> #include <InterViews/world.h> - - #ifdef HAVE_ACE - #include <ComUnidraw/comterp-acehandler.h> - #include <OverlayUnidraw/aceimport.h> - #include <AceDispatch/ace_dispatcher.h> - #endif #include <stream.h> #include <string.h> --- 45,50 ---- Index: flipbook/main.c diff -c flipbook/main.c:1.4 flipbook/main.c:1.5 *** flipbook/main.c:1.4 Tue Feb 19 16:18:23 2002 --- src/flipbook/main.c Thu Sep 5 16:15:43 2002 *************** *** 26,31 **** --- 26,37 ---- * Frame editor main program. */ + #ifdef HAVE_ACE + #include <ComUnidraw/comterp-acehandler.h> + #include <OverlayUnidraw/aceimport.h> + #include <AceDispatch/ace_dispatcher.h> + #endif + #include <FrameUnidraw/framecatalog.h> #include <FrameUnidraw/framecreator.h> #include <FrameUnidraw/frameeditor.h> *************** *** 33,44 **** #include <OverlayUnidraw/ovunidraw.h> #include <InterViews/world.h> - - #ifdef HAVE_ACE - #include <ComUnidraw/comterp-acehandler.h> - #include <OverlayUnidraw/aceimport.h> - #include <AceDispatch/ace_dispatcher.h> - #endif #include <stdio.h> #include <stream.h> --- 39,44 ---- Index: graphdraw/main.c diff -c graphdraw/main.c:1.5 graphdraw/main.c:1.6 *** graphdraw/main.c:1.5 Tue Feb 19 16:18:26 2002 --- src/graphdraw/main.c Thu Sep 5 16:15:46 2002 *************** *** 26,31 **** --- 26,37 ---- * Graph editor main program. */ + #ifdef HAVE_ACE + #include <ComUnidraw/comterp-acehandler.h> + #include <OverlayUnidraw/aceimport.h> + #include <AceDispatch/ace_dispatcher.h> + #endif + #include <GraphUnidraw/graphcatalog.h> #include <GraphUnidraw/graphcreator.h> #include <GraphUnidraw/grapheditor.h> *************** *** 38,49 **** #include <string.h> #include <math.h> #include <version.h> - - #ifdef HAVE_ACE - #include <ComUnidraw/comterp-acehandler.h> - #include <OverlayUnidraw/aceimport.h> - #include <AceDispatch/ace_dispatcher.h> - #endif /*****************************************************************************/ --- 44,49 ---- Index: drawserv/main.c diff -c drawserv/main.c:1.3 drawserv/main.c:1.4 *** drawserv/main.c:1.3 Tue Feb 19 16:18:29 2002 --- src/drawserv_/main.c Thu Sep 5 16:15:47 2002 *************** *** 26,31 **** --- 26,37 ---- * drawserv main program. */ + #ifdef HAVE_ACE + #include <ComUnidraw/comterp-acehandler.h> + #include <OverlayUnidraw/aceimport.h> + #include <AceDispatch/ace_dispatcher.h> + #endif + #include <DrawServ/drawcatalog.h> #include <DrawServ/drawcreator.h> #include <DrawServ/drawcomps.h> *************** *** 43,54 **** #include <Unidraw/iterator.h> #include <InterViews/world.h> - - #ifdef HAVE_ACE - #include <ComUnidraw/comterp-acehandler.h> - #include <OverlayUnidraw/aceimport.h> - #include <AceDispatch/ace_dispatcher.h> - #endif #include <stream.h> #include <string.h> --- 49,54 ---- *** /dev/null Thu Sep 5 16:15:54 PDT 2002 --- patches/ivtools-020905-johnston-065 *************** patches/ivtools-020905-johnston-065 *** 0 **** --- 1 ---- + ivtools-020905-johnston-065 ------------------------------------------------------- This sf.net email is sponsored by: OSDN - Tired of that same old cell phone? Get a new here for FREE! https://www.inphonic.com/r.asp?r=sourceforge1&refcode1=vs3390