fixed addtool bug, compile fixes for ACE-5.4.7 with gcc-4.0, and suse-9.3\ on amd64
[email protected] Tue, 4 Oct 2005 10:44:43 -0700
| Newsgroups | gmane.comp.lib.ivtools.patches |
|---|---|
| Message-ID | <[email protected]> |
--Apple-Mail-3--183171928 Content-Transfer-Encoding: 7bit Content-Type: application/octet-stream; x-unix-mode=0644; name="ivtools-051004-johnston-010" Content-Disposition: attachment; filename=ivtools-051004-johnston-010 Patch: ivtools-051004-johnston-010 For: ivtools-1.2.2 Author: [email protected] Subject: fixed addtool bug, compile fixes for ACE-5.4.7 with gcc-4.0, and suse-9.3 on amd64 Requires: This is an intermediate patch to ivtools-1.2.2. 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: - changes necessary to compile with gcc-4.0 on top of ACE-5.4.7 - changes necessary to compile on suse-9.3 linux (amd64 platform). Contributed by Paul Vixie. - fixed bug in "addtool" command/mechanism in graphdraw and drawserv Index: ComTerp/comhandler.c diff -c ComTerp/comhandler.c:1.1 ComTerp/comhandler.c:1.2 *** ComTerp/comhandler.c:1.1 Tue Jun 15 08:53:38 2004 --- src/ComTerp/comhandler.c Tue Oct 4 10:36:38 2005 *************** *** 23,32 **** */ #ifdef HAVE_ACE - - #include <ComTerp/comhandler.h> - #include <ComTerp/comterpserv.h> - #include <iostream.h> #include <fstream.h> #if __GNUC__==2 && __GNUC_MINOR__<=7 --- 23,28 ---- *************** *** 34,39 **** --- 30,38 ---- #include <vector.h> #endif + #include <ComTerp/comhandler.h> + #include <ComTerp/comterpserv.h> + #include <signal.h> #if BUFSIZ>1024 Index: ComTerp/ctrlfunc.c diff -c ComTerp/ctrlfunc.c:1.2 ComTerp/ctrlfunc.c:1.3 *** ComTerp/ctrlfunc.c:1.2 Fri Sep 16 11:06:35 2005 --- src/ComTerp/ctrlfunc.c Tue Oct 4 10:36:38 2005 *************** *** 146,154 **** #if __GNUC__<3 filebuf ofbuf; ofbuf.attach(socket.get_handle()); ! #else fileptr_filebuf ofbuf((int)socket.get_handle(), ios_base::out, false, static_cast<size_t>(BUFSIZ)); #endif ostream out(&ofbuf); const char* cmdstr = cmdstrv.string_ptr(); --- 146,157 ---- #if __GNUC__<3 filebuf ofbuf; ofbuf.attach(socket.get_handle()); ! #elif __GNUC__<4 fileptr_filebuf ofbuf((int)socket.get_handle(), ios_base::out, false, static_cast<size_t>(BUFSIZ)); + #else + fileptr_filebuf ofbuf((int)socket.get_handle(), ios_base::out, + static_cast<size_t>(BUFSIZ)); #endif ostream out(&ofbuf); const char* cmdstr = cmdstrv.string_ptr(); Index: ComUtil/_parser.c diff -c ComUtil/_parser.c:1.1 ComUtil/_parser.c:1.2 *** ComUtil/_parser.c:1.1 Tue Jun 15 08:53:26 2004 --- src/ComUtil/_parser.c Tue Oct 4 10:36:36 2005 *************** *** 440,446 **** { ! int nchar; /* Number of characters in operator */ int status; /* Read token from input file */ --- 440,446 ---- { ! unsigned int nchar; /* Number of characters in operator */ int status; /* Read token from input file */ Index: ComUtil/comerr.c diff -c ComUtil/comerr.c:1.1 ComUtil/comerr.c:1.2 *** ComUtil/comerr.c:1.1 Tue Jun 15 08:53:26 2004 --- src/ComUtil/comerr.c Tue Oct 4 10:36:36 2005 *************** *** 186,192 **** #define TITLE "comerr_get" { ! int get_errnum; int get_errid; /* If non-initialized, answer must be 0 */ --- 186,192 ---- #define TITLE "comerr_get" { ! unsigned int get_errnum; int get_errid; /* If non-initialized, answer must be 0 */ *************** *** 247,253 **** #define TITLE "comerr_chk" { ! int get_errnum; int get_errid; /* If non-initialized, answer must be FALSE */ --- 247,253 ---- #define TITLE "comerr_chk" { ! unsigned int get_errnum; int get_errid; /* If non-initialized, answer must be FALSE */ Index: ComUtil/errfile.c diff -c ComUtil/errfile.c:1.1 ComUtil/errfile.c:1.2 *** ComUtil/errfile.c:1.1 Tue Jun 15 08:53:26 2004 --- src/ComUtil/errfile.c Tue Oct 4 10:36:36 2005 *************** *** 113,123 **** int search_state = LOOK_POUND; /* State of what has been found */ /* in error file */ ! int token_type; /* Type of token returned from lexscan */ ! int linenum = 0; /* Current line number in error file */ ! int colnum = 0; /* Current location in buffer */ ! int token_length; /* Token length */ ! int token_start; /* Start of token in FormatBuffer */ int status; /* Status from lexscan */ --- 113,123 ---- int search_state = LOOK_POUND; /* State of what has been found */ /* in error file */ ! unsigned int token_type; /* Type of token returned from lexscan */ ! unsigned int linenum = 0; /* Current line number in error file */ ! unsigned int colnum = 0; /* Current location in buffer */ ! unsigned int token_length; /* Token length */ ! unsigned int token_start; /* Start of token in FormatBuffer */ int status; /* Status from lexscan */ Index: ComUtil/util.h diff -c ComUtil/util.h:1.1 ComUtil/util.h:1.2 *** ComUtil/util.h:1.1 Tue Jun 15 08:53:27 2004 --- src/ComUtil/util.h Tue Oct 4 10:36:36 2005 *************** *** 517,523 **** memcpy((char *)(dest),(char *)(src),(unsigned)(count)) #else #define MEMCPY(dest,src,count) \ ! bcopy((char*)src,(char*)dest,(int)(count)) #endif #define MEMSET(dest,c,count) \ memset((char *)(dest),(int)(c),(unsigned)(count)) --- 517,523 ---- memcpy((char *)(dest),(char *)(src),(unsigned)(count)) #else #define MEMCPY(dest,src,count) \ ! bcopy((const void*)src,(void*)dest,(size_t)(count)) #endif #define MEMSET(dest,c,count) \ memset((char *)(dest),(int)(c),(unsigned)(count)) Index: config_ivtools/params.def diff -c config_ivtools/params.def:1.3 config_ivtools/params.def:1.4 *** config_ivtools/params.def:1.3 Tue Jan 25 09:47:42 2005 --- config/params.def Tue Oct 4 10:37:02 2005 *************** *** 347,352 **** --- 347,361 ---- $(CCINCLUDES) #endif + #ifndef IvCFlags + #define IvCFlags \ @@\ + DefaultDebugCCFlags\ @@\ + DefaultOptimizeCCFlags\ @@\ + $(SHARED_CCFLAGS)\ @@\ + $(CDEFINES)\ @@\ + $(CCINCLUDES) + #endif + #ifndef DefaultDebugCCFlags #if TurnOnDebugging #define DefaultDebugCCFlags $(DEBUG_CCFLAGS) *************** *** 401,406 **** --- 410,416 ---- CCFLAGS = CCFlags IV_CCFLAGS = IvCCFlags + IV_CFLAGS = IvCFlags DEBUG_CCFLAGS = DebugCCFlags OPTIMIZE_CCFLAGS = OptimizeCCFlags SHARED_CCFLAGS = /* defined when MakeLibrary() is used in Imakefile */ *************** *** 420,427 **** #define IvCCDefines $(LANGUAGE_CCDEFINES) $(BACKWARD_CCDEFINES) #endif ! #ifndef LanguageCCDefines ! #define LanguageCCDefines -Dcplusplus_2_1 #endif #ifndef BackwardCompatibilityCCDefines --- 430,444 ---- #define IvCCDefines $(LANGUAGE_CCDEFINES) $(BACKWARD_CCDEFINES) #endif ! /* ! * Define the defines passed to the C compiler when we compile a C file. ! */ ! #ifndef CDefines ! #define CDefines $(APP_CCDEFINES) $(IV_CDEFINES) $(OTHER_CCDEFINES) $(EXTRA_CCDEFINES) ! #endif ! ! #ifndef IvCDefines ! #define IvCDefines -D_POSIX_C_SOURCE $(BACKWARD_CCDEFINES) #endif #ifndef BackwardCompatibilityCCDefines *************** *** 478,483 **** --- 495,502 ---- CCDEFINES = CCDefines IV_CCDEFINES = IvCCDefines + CDEFINES = CDefines + IV_CDEFINES = IvCDefines LANGUAGE_CCDEFINES = LanguageCCDefines BACKWARD_CCDEFINES = /* defined when Use_2_6() is used in Imakefile */ EXTRA_CCDEFINES = ExtraCCDefines *************** *** 609,617 **** /* * Define all the flags passed to the C driver when we compile a C file. */ #ifndef CFlags ! #define CFlags CCFlags #endif CFLAGS = CFlags --- 628,637 ---- /* * Define all the flags passed to the C driver when we compile a C file. + * 10/3/05: change to $(IV_CFLAGS) to avoid -Wno-deprecated warning */ #ifndef CFlags ! #define CFlags $(APP_CCFLAGS) $(IV_CFLAGS) $(OTHER_CCFLAGS) $(EXTRA_CCFLAGS) #endif CFLAGS = CFlags Index: config_ivtools/rules.def diff -c config_ivtools/rules.def:1.1 config_ivtools/rules.def:1.2 *** config_ivtools/rules.def:1.1 Tue Jun 15 08:58:30 2004 --- config/rules.def Tue Oct 4 10:37:02 2005 *************** *** 1092,1107 **** #if InstallRelative #define InstallSymLink(dir, file) /**/ #else ! #if !defined(SVR4) ! #if defined(DARWIN) ! #define InstallSymLink(dir, file) @@\ ! install:: @@\ ! MakeDir(dir) @@\ ! cp -f file dir @@\ ! @@\ ! uninstall:: @@\ ! $(RM) dir/file ! #else #define InstallSymLink(dir, file) @@\ install:: @@\ MakeDir(dir) @@\ --- 1092,1098 ---- #if InstallRelative #define InstallSymLink(dir, file) /**/ #else ! #if !defined(SVR4) && !defined(DarwinArchitecture) #define InstallSymLink(dir, file) @@\ install:: @@\ MakeDir(dir) @@\ *************** *** 1109,1115 **** @@\ uninstall:: @@\ $(RM) dir/file - #endif #else #define InstallSymLink(dir, file) @@\ install:: @@\ --- 1100,1105 ---- Index: DrawServ/ackback-handler.c diff -c DrawServ/ackback-handler.c:1.1 DrawServ/ackback-handler.c:1.2 *** DrawServ/ackback-handler.c:1.1 Tue Jun 15 08:56:49 2004 --- src/DrawServ/ackback-handler.c Tue Oct 4 10:36:54 2005 *************** *** 23,28 **** --- 23,31 ---- #ifdef HAVE_ACE + #include <vector.h> + #include <err.h> + #include <DrawServ/ackback-handler.h> #include <DrawServ/draweditor.h> #include <DrawServ/drawkit.h> *************** *** 32,40 **** #include <IVGlyph/gdialogs.h> #include <InterViews/window.h> - #include <vector.h> - #include <err.h> - /*****************************************************************************/ // Default constructor. --- 35,40 ---- Index: DrawServ/drawfunc.c diff -c DrawServ/drawfunc.c:1.1 DrawServ/drawfunc.c:1.2 *** DrawServ/drawfunc.c:1.1 Tue Jun 15 08:56:50 2004 --- src/DrawServ/drawfunc.c Tue Oct 4 10:36:54 2005 *************** *** 88,94 **** --- 88,98 ---- ((DrawServ*)unidraw)->cycletest (sidv.uint_val(), hostv.string_ptr(), userv.string_ptr(), pidv.int_val())) { #if 1 + #if __GNUC__<4 fileptr_filebuf obuf(comterp()->handler()->get_handle(), ios_base::out, false, static_cast<size_t>(BUFSIZ)); + #else + fileptr_filebuf obuf(comterp()->handler()->get_handle(), ios_base::out, static_cast<size_t>(BUFSIZ)); + #endif ostream out(&obuf); out << "ackback(cycle)\n"; out.flush(); Index: DrawServ/drawkit.c diff -c DrawServ/drawkit.c:1.1 DrawServ/drawkit.c:1.2 *** DrawServ/drawkit.c:1.1 Tue Jun 15 08:56:50 2004 --- src/DrawServ/drawkit.c Tue Oct 4 10:36:54 2005 *************** *** 196,204 **** _toolbars = layout.deck(2); ! PolyGlyph* vb = layout.vbox(16); ! TelltaleGroup* tg = new TelltaleGroup(); Glyph* sel = kit.label("Select"); Glyph* mov = kit.label("Move"); --- 196,206 ---- _toolbars = layout.deck(2); ! PolyGlyph* vb = layout.vbox(); ! _toolbar_vbox = new Glyph*[2]; ! _toolbar_vbox[0] = vb; ! _tg = new TelltaleGroup(); Glyph* sel = kit.label("Select"); Glyph* mov = kit.label("Move"); *************** *** 283,313 **** vb->append(select = MakeTool(new SelectTool(new ControlInfo("Select", KLBL_SELECT, CODE_SELECT)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(sel)), ! tg, _ed->MouseDocObservable(), mouse_sel)); vb->append(move = MakeTool(new MoveTool(new ControlInfo("Move", KLBL_MOVE, CODE_MOVE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(mov)), ! tg, _ed->MouseDocObservable(), mouse_mov)); vb->append(MakeTool(new ScaleTool(new ControlInfo("Scale", KLBL_SCALE, CODE_SCALE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(scl)), tg, _ed->MouseDocObservable(), mouse_scl)); vb->append(MakeTool(new StretchTool(new ControlInfo("Stretch", KLBL_STRETCH,CODE_STRETCH)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(str)), tg, _ed->MouseDocObservable(), mouse_str)); vb->append(MakeTool(new RotateTool(new ControlInfo("Rotate", KLBL_ROTATE, CODE_ROTATE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(rot)), tg, _ed->MouseDocObservable(), mouse_rot)); vb->append(reshape = MakeTool(new ReshapeTool(new ControlInfo("Alter", KLBL_RESHAPE, CODE_RESHAPE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(alt)), tg, _ed->MouseDocObservable(), mouse_alt)); vb->append(magnify = MakeTool(new MagnifyTool(new ControlInfo("Magnify", KLBL_MAGNIFY,CODE_MAGNIFY)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(mag)), tg, _ed->MouseDocObservable(), mouse_mag)); TextGraphic* text = new TextGraphic("Text", stdgraphic); TextOvComp* textComp = new TextOvComp(text); vb->append(MakeTool(new GraphicCompTool(new ControlInfo("Text", KLBL_TEXT, CODE_TEXT), textComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(txt)), tg, _ed->MouseDocObservable(), mouse_txt)); ArrowLine* line = new ArrowLine( 0, 0, unit, unit, false, false, 1., stdgraphic ); --- 285,315 ---- vb->append(select = MakeTool(new SelectTool(new ControlInfo("Select", KLBL_SELECT, CODE_SELECT)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(sel)), ! _tg, _ed->MouseDocObservable(), mouse_sel)); vb->append(move = MakeTool(new MoveTool(new ControlInfo("Move", KLBL_MOVE, CODE_MOVE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(mov)), ! _tg, _ed->MouseDocObservable(), mouse_mov)); vb->append(MakeTool(new ScaleTool(new ControlInfo("Scale", KLBL_SCALE, CODE_SCALE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(scl)), _tg, _ed->MouseDocObservable(), mouse_scl)); vb->append(MakeTool(new StretchTool(new ControlInfo("Stretch", KLBL_STRETCH,CODE_STRETCH)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(str)), _tg, _ed->MouseDocObservable(), mouse_str)); vb->append(MakeTool(new RotateTool(new ControlInfo("Rotate", KLBL_ROTATE, CODE_ROTATE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(rot)), _tg, _ed->MouseDocObservable(), mouse_rot)); vb->append(reshape = MakeTool(new ReshapeTool(new ControlInfo("Alter", KLBL_RESHAPE, CODE_RESHAPE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(alt)), _tg, _ed->MouseDocObservable(), mouse_alt)); vb->append(magnify = MakeTool(new MagnifyTool(new ControlInfo("Magnify", KLBL_MAGNIFY,CODE_MAGNIFY)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(mag)), _tg, _ed->MouseDocObservable(), mouse_mag)); TextGraphic* text = new TextGraphic("Text", stdgraphic); TextOvComp* textComp = new TextOvComp(text); vb->append(MakeTool(new GraphicCompTool(new ControlInfo("Text", KLBL_TEXT, CODE_TEXT), textComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(txt)), _tg, _ed->MouseDocObservable(), mouse_txt)); ArrowLine* line = new ArrowLine( 0, 0, unit, unit, false, false, 1., stdgraphic ); *************** *** 315,321 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(arrowLineComp, KLBL_LINE, CODE_LINE), arrowLineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(glin)), ! tg, _ed->MouseDocObservable(), mouse_lin)); ArrowMultiLine* ml = new ArrowMultiLine( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); --- 317,323 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(arrowLineComp, KLBL_LINE, CODE_LINE), arrowLineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(glin)), ! _tg, _ed->MouseDocObservable(), mouse_lin)); ArrowMultiLine* ml = new ArrowMultiLine( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); *************** *** 324,330 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(mlComp, KLBL_MULTILINE, CODE_MULTILINE), mlComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gmlin)), ! tg, _ed->MouseDocObservable(), mouse_mlin)); ArrowOpenBSpline* spl = new ArrowOpenBSpline( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); --- 326,332 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(mlComp, KLBL_MULTILINE, CODE_MULTILINE), mlComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gmlin)), ! _tg, _ed->MouseDocObservable(), mouse_mlin)); ArrowOpenBSpline* spl = new ArrowOpenBSpline( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); *************** *** 333,360 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(splComp, KLBL_SPLINE, CODE_SPLINE), splComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gospl)), ! tg, _ed->MouseDocObservable(), mouse_ospl)); SF_Rect* rect = new SF_Rect(0, 0, unit, unit*4/5, stdgraphic); rect->SetPattern(psnonepat); RectOvComp* rectComp = new RectOvComp(rect); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(rectComp, KLBL_RECT, CODE_RECT), rectComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(grect)), ! tg, _ed->MouseDocObservable(), mouse_rect)); SF_Ellipse* ellipse = new SF_Ellipse(0, 0, unit*2/3, unit*2/5, stdgraphic); ellipse->SetPattern(psnonepat); EllipseOvComp* ellipseComp = new EllipseOvComp(ellipse); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(ellipseComp, KLBL_ELLIPSE, CODE_ELLIPSE), ellipseComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gellp)), ! tg, _ed->MouseDocObservable(), mouse_ellp)); SF_Polygon* polygon = new SF_Polygon(xClosed, yClosed, nClosed,stdgraphic); polygon->SetPattern(psnonepat); PolygonOvComp* polygonComp = new PolygonOvComp(polygon); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(polygonComp, KLBL_POLY, CODE_POLY), polygonComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gpoly)), ! tg, _ed->MouseDocObservable(), mouse_poly)); SFH_ClosedBSpline* cspline = new SFH_ClosedBSpline( xClosed, yClosed, nClosed, stdgraphic ); --- 335,362 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(splComp, KLBL_SPLINE, CODE_SPLINE), splComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gospl)), ! _tg, _ed->MouseDocObservable(), mouse_ospl)); SF_Rect* rect = new SF_Rect(0, 0, unit, unit*4/5, stdgraphic); rect->SetPattern(psnonepat); RectOvComp* rectComp = new RectOvComp(rect); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(rectComp, KLBL_RECT, CODE_RECT), rectComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(grect)), ! _tg, _ed->MouseDocObservable(), mouse_rect)); SF_Ellipse* ellipse = new SF_Ellipse(0, 0, unit*2/3, unit*2/5, stdgraphic); ellipse->SetPattern(psnonepat); EllipseOvComp* ellipseComp = new EllipseOvComp(ellipse); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(ellipseComp, KLBL_ELLIPSE, CODE_ELLIPSE), ellipseComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gellp)), ! _tg, _ed->MouseDocObservable(), mouse_ellp)); SF_Polygon* polygon = new SF_Polygon(xClosed, yClosed, nClosed,stdgraphic); polygon->SetPattern(psnonepat); PolygonOvComp* polygonComp = new PolygonOvComp(polygon); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(polygonComp, KLBL_POLY, CODE_POLY), polygonComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gpoly)), ! _tg, _ed->MouseDocObservable(), mouse_poly)); SFH_ClosedBSpline* cspline = new SFH_ClosedBSpline( xClosed, yClosed, nClosed, stdgraphic ); *************** *** 363,379 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(csplineComp, KLBL_CSPLINE,CODE_CSPLINE), csplineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gcspl)), ! tg, _ed->MouseDocObservable(), mouse_cspl)); vb->append(MakeTool(new AnnotateTool(new ControlInfo("Annotate", "A", "A")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(anno)), tg, _ed->MouseDocObservable(), mouse_anno)); vb->append(MakeTool(new AttributeTool(new ControlInfo("Attribute", "T", "T")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(attr)), tg, _ed->MouseDocObservable(), mouse_attr)); _toolbars->append(vb); ! vb = layout.vbox(7); ! vb->append(select); vb->append(move); vb->append(reshape); --- 365,381 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(csplineComp, KLBL_CSPLINE,CODE_CSPLINE), csplineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gcspl)), ! _tg, _ed->MouseDocObservable(), mouse_cspl)); vb->append(MakeTool(new AnnotateTool(new ControlInfo("Annotate", "A", "A")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(anno)), _tg, _ed->MouseDocObservable(), mouse_anno)); vb->append(MakeTool(new AttributeTool(new ControlInfo("Attribute", "T", "T")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(attr)), _tg, _ed->MouseDocObservable(), mouse_attr)); _toolbars->append(vb); ! vb = layout.vbox(); ! _toolbar_vbox[1] = vb; vb->append(select); vb->append(move); vb->append(reshape); *************** *** 385,391 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protoedge, "E","E"), protoedge), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gedge)), tg, _ed->MouseDocObservable(), GraphKit::mouse_edge)); SF_Ellipse* nellipse = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse->SetPattern(psnonepat); TextGraphic* ntext = new TextGraphic("___", stdgraphic); --- 387,393 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protoedge, "E","E"), protoedge), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gedge)), _tg, _ed->MouseDocObservable(), GraphKit::mouse_edge)); SF_Ellipse* nellipse = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse->SetPattern(psnonepat); TextGraphic* ntext = new TextGraphic("___", stdgraphic); *************** *** 394,400 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode, "N","N"), protonode), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod1)), tg, _ed->MouseDocObservable(), GraphKit::mouse_node)); SF_Ellipse* nellipse2 = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse2->SetPattern(psnonepat); TextGraphic* ntext2 = new TextGraphic("abc", stdgraphic); --- 396,402 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode, "N","N"), protonode), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod1)), _tg, _ed->MouseDocObservable(), GraphKit::mouse_node)); SF_Ellipse* nellipse2 = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse2->SetPattern(psnonepat); TextGraphic* ntext2 = new TextGraphic("abc", stdgraphic); *************** *** 403,409 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode2, "L","L"), protonode2), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod2)), tg, _ed->MouseDocObservable(), GraphKit::mouse_lnode)); _toolbars->append(vb); --- 405,411 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode2, "L","L"), protonode2), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod2)), _tg, _ed->MouseDocObservable(), GraphKit::mouse_lnode)); _toolbars->append(vb); Index: DrawServ/drawlink.c diff -c DrawServ/drawlink.c:1.1 DrawServ/drawlink.c:1.2 *** DrawServ/drawlink.c:1.1 Tue Jun 15 08:56:50 2004 --- src/DrawServ/drawlink.c Tue Oct 4 10:36:54 2005 *************** *** 95,101 **** --- 95,105 ---- if (ComterpHandler::reactor_singleton()->register_handler(ackhandler(), ACE_Event_Handler::READ_MASK|ACE_Event_Handler::TIMER_MASK)==-1) fprintf(stderr, "drawserv: error registering ackback handler (handle==%d)\n", _socket->get_handle()); + #if __GNUC__<4 fileptr_filebuf obuf(_socket->get_handle(), ios_base::out, false, static_cast<size_t>(BUFSIZ)); + #else + fileptr_filebuf obuf(_socket->get_handle(), ios_base::out, static_cast<size_t>(BUFSIZ)); + #endif ostream out(&obuf); out << "drawlink(\""; char buffer[HOST_NAME_MAX]; Index: DrawServ/drawserv.c diff -c DrawServ/drawserv.c:1.1 DrawServ/drawserv.c:1.2 *** DrawServ/drawserv.c:1.1 Tue Jun 15 08:56:50 2004 --- src/DrawServ/drawserv.c Tue Oct 4 10:36:54 2005 *************** *** 364,370 **** --- 364,374 ---- if (link && link != orglink && link->state()==DrawLink::two_way) { int fd = link->handle(); if (fd>=0) { + #if __GNUC__<4 fileptr_filebuf fbuf(fd, ios_base::out, false, static_cast<size_t>(BUFSIZ)); + #else + fileptr_filebuf fbuf(fd, ios_base::out, static_cast<size_t>(BUFSIZ)); + #endif ostream out(&fbuf); out << cmdstring; out << "\n"; *************** *** 382,388 **** --- 386,396 ---- if (link) { int fd = link->handle(); if (fd>=0) { + #if __GNUC__<4 fileptr_filebuf fbuf(fd, ios_base::out, false, static_cast<size_t>(BUFSIZ)); + #else + fileptr_filebuf fbuf(fd, ios_base::out, static_cast<size_t>(BUFSIZ)); + #endif ostream out(&fbuf); out << cmdstring; out << "\n"; *************** *** 656,666 **** SessionIdTable_Iterator it(*table); while(it.more()) { SessionId* sid = (SessionId*)it.cur_value(); DrawLink* testlink = sid->drawlink(); ! unsigned int altid = it.cur_key(); it.next(); if (testlink==link) ! if (!table->find_and_remove((void*)sid, altid)) fprintf(stderr, "unable to remove SessionId's associated with DrawLink\n"); } } --- 664,675 ---- SessionIdTable_Iterator it(*table); while(it.more()) { SessionId* sid = (SessionId*)it.cur_value(); + void* vsid = (void*)sid; DrawLink* testlink = sid->drawlink(); ! int altid = it.cur_key(); it.next(); if (testlink==link) ! if (!table->find_and_remove(vsid, altid)) fprintf(stderr, "unable to remove SessionId's associated with DrawLink\n"); } } Index: GraphUnidraw/graphkit.c diff -c GraphUnidraw/graphkit.c:1.1 GraphUnidraw/graphkit.c:1.2 *** GraphUnidraw/graphkit.c:1.1 Tue Jun 15 08:56:43 2004 --- src/GraphUnidraw/graphkit.c Tue Oct 4 10:36:52 2005 *************** *** 365,373 **** _toolbars = layout.deck(2); ! PolyGlyph* vb = layout.vbox(16); ! TelltaleGroup* tg = new TelltaleGroup(); Glyph* sel = kit.label("Select"); Glyph* mov = kit.label("Move"); --- 365,375 ---- _toolbars = layout.deck(2); ! PolyGlyph* vb = layout.vbox(); ! _toolbar_vbox = new Glyph*[2]; ! _toolbar_vbox[0] = vb; ! _tg = new TelltaleGroup(); Glyph* sel = kit.label("Select"); Glyph* mov = kit.label("Move"); *************** *** 452,482 **** vb->append(select = MakeTool(new SelectTool(new ControlInfo("Select", KLBL_SELECT, CODE_SELECT)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(sel)), ! tg, _ed->MouseDocObservable(), mouse_sel)); vb->append(move = MakeTool(new GraphMoveTool(new ControlInfo("Move", KLBL_MOVE, CODE_MOVE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(mov)), ! tg, _ed->MouseDocObservable(), mouse_mov)); vb->append(MakeTool(new ScaleTool(new ControlInfo("Scale", KLBL_SCALE, CODE_SCALE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(scl)), tg, _ed->MouseDocObservable(), mouse_scl)); vb->append(MakeTool(new StretchTool(new ControlInfo("Stretch", KLBL_STRETCH,CODE_STRETCH)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(str)), tg, _ed->MouseDocObservable(), mouse_str)); vb->append(MakeTool(new RotateTool(new ControlInfo("Rotate", KLBL_ROTATE, CODE_ROTATE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(rot)), tg, _ed->MouseDocObservable(), mouse_rot)); vb->append(reshape = MakeTool(new ReshapeTool(new ControlInfo("Alter", KLBL_RESHAPE, CODE_RESHAPE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(alt)), tg, _ed->MouseDocObservable(), mouse_alt)); vb->append(magnify = MakeTool(new MagnifyTool(new ControlInfo("Magnify", KLBL_MAGNIFY,CODE_MAGNIFY)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(mag)), tg, _ed->MouseDocObservable(), mouse_mag)); TextGraphic* text = new TextGraphic("Text", stdgraphic); TextOvComp* textComp = new TextOvComp(text); vb->append(MakeTool(new GraphicCompTool(new ControlInfo("Text", KLBL_TEXT, CODE_TEXT), textComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(txt)), tg, _ed->MouseDocObservable(), mouse_txt)); ArrowLine* line = new ArrowLine( 0, 0, unit, unit, false, false, 1., stdgraphic ); --- 454,484 ---- vb->append(select = MakeTool(new SelectTool(new ControlInfo("Select", KLBL_SELECT, CODE_SELECT)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(sel)), ! _tg, _ed->MouseDocObservable(), mouse_sel)); vb->append(move = MakeTool(new GraphMoveTool(new ControlInfo("Move", KLBL_MOVE, CODE_MOVE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(mov)), ! _tg, _ed->MouseDocObservable(), mouse_mov)); vb->append(MakeTool(new ScaleTool(new ControlInfo("Scale", KLBL_SCALE, CODE_SCALE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(scl)), _tg, _ed->MouseDocObservable(), mouse_scl)); vb->append(MakeTool(new StretchTool(new ControlInfo("Stretch", KLBL_STRETCH,CODE_STRETCH)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(str)), _tg, _ed->MouseDocObservable(), mouse_str)); vb->append(MakeTool(new RotateTool(new ControlInfo("Rotate", KLBL_ROTATE, CODE_ROTATE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(rot)), _tg, _ed->MouseDocObservable(), mouse_rot)); vb->append(reshape = MakeTool(new ReshapeTool(new ControlInfo("Alter", KLBL_RESHAPE, CODE_RESHAPE)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(alt)), _tg, _ed->MouseDocObservable(), mouse_alt)); vb->append(magnify = MakeTool(new MagnifyTool(new ControlInfo("Magnify", KLBL_MAGNIFY,CODE_MAGNIFY)), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(mag)), _tg, _ed->MouseDocObservable(), mouse_mag)); TextGraphic* text = new TextGraphic("Text", stdgraphic); TextOvComp* textComp = new TextOvComp(text); vb->append(MakeTool(new GraphicCompTool(new ControlInfo("Text", KLBL_TEXT, CODE_TEXT), textComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(txt)), _tg, _ed->MouseDocObservable(), mouse_txt)); ArrowLine* line = new ArrowLine( 0, 0, unit, unit, false, false, 1., stdgraphic ); *************** *** 484,490 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(arrowLineComp, KLBL_LINE, CODE_LINE), arrowLineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(glin)), ! tg, _ed->MouseDocObservable(), mouse_lin)); ArrowMultiLine* ml = new ArrowMultiLine( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); --- 486,492 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(arrowLineComp, KLBL_LINE, CODE_LINE), arrowLineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(glin)), ! _tg, _ed->MouseDocObservable(), mouse_lin)); ArrowMultiLine* ml = new ArrowMultiLine( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); *************** *** 493,499 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(mlComp, KLBL_MULTILINE, CODE_MULTILINE), mlComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gmlin)), ! tg, _ed->MouseDocObservable(), mouse_mlin)); ArrowOpenBSpline* spl = new ArrowOpenBSpline( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); --- 495,501 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(mlComp, KLBL_MULTILINE, CODE_MULTILINE), mlComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gmlin)), ! _tg, _ed->MouseDocObservable(), mouse_mlin)); ArrowOpenBSpline* spl = new ArrowOpenBSpline( xOpen, yOpen, nOpen, false, false, 1., stdgraphic ); *************** *** 502,529 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(splComp, KLBL_SPLINE, CODE_SPLINE), splComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gospl)), ! tg, _ed->MouseDocObservable(), mouse_ospl)); SF_Rect* rect = new SF_Rect(0, 0, unit, unit*4/5, stdgraphic); rect->SetPattern(psnonepat); RectOvComp* rectComp = new RectOvComp(rect); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(rectComp, KLBL_RECT, CODE_RECT), rectComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(grect)), ! tg, _ed->MouseDocObservable(), mouse_rect)); SF_Ellipse* ellipse = new SF_Ellipse(0, 0, unit*2/3, unit*2/5, stdgraphic); ellipse->SetPattern(psnonepat); EllipseOvComp* ellipseComp = new EllipseOvComp(ellipse); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(ellipseComp, KLBL_ELLIPSE, CODE_ELLIPSE), ellipseComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gellp)), ! tg, _ed->MouseDocObservable(), mouse_ellp)); SF_Polygon* polygon = new SF_Polygon(xClosed, yClosed, nClosed,stdgraphic); polygon->SetPattern(psnonepat); PolygonOvComp* polygonComp = new PolygonOvComp(polygon); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(polygonComp, KLBL_POLY, CODE_POLY), polygonComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gpoly)), ! tg, _ed->MouseDocObservable(), mouse_poly)); SFH_ClosedBSpline* cspline = new SFH_ClosedBSpline( xClosed, yClosed, nClosed, stdgraphic ); --- 504,531 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(splComp, KLBL_SPLINE, CODE_SPLINE), splComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gospl)), ! _tg, _ed->MouseDocObservable(), mouse_ospl)); SF_Rect* rect = new SF_Rect(0, 0, unit, unit*4/5, stdgraphic); rect->SetPattern(psnonepat); RectOvComp* rectComp = new RectOvComp(rect); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(rectComp, KLBL_RECT, CODE_RECT), rectComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(grect)), ! _tg, _ed->MouseDocObservable(), mouse_rect)); SF_Ellipse* ellipse = new SF_Ellipse(0, 0, unit*2/3, unit*2/5, stdgraphic); ellipse->SetPattern(psnonepat); EllipseOvComp* ellipseComp = new EllipseOvComp(ellipse); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(ellipseComp, KLBL_ELLIPSE, CODE_ELLIPSE), ellipseComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gellp)), ! _tg, _ed->MouseDocObservable(), mouse_ellp)); SF_Polygon* polygon = new SF_Polygon(xClosed, yClosed, nClosed,stdgraphic); polygon->SetPattern(psnonepat); PolygonOvComp* polygonComp = new PolygonOvComp(polygon); vb->append(MakeTool(new GraphicCompTool(new ControlInfo(polygonComp, KLBL_POLY, CODE_POLY), polygonComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gpoly)), ! _tg, _ed->MouseDocObservable(), mouse_poly)); SFH_ClosedBSpline* cspline = new SFH_ClosedBSpline( xClosed, yClosed, nClosed, stdgraphic ); *************** *** 532,548 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(csplineComp, KLBL_CSPLINE,CODE_CSPLINE), csplineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gcspl)), ! tg, _ed->MouseDocObservable(), mouse_cspl)); vb->append(MakeTool(new AnnotateTool(new ControlInfo("Annotate", "A", "A")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(anno)), tg, _ed->MouseDocObservable(), mouse_anno)); vb->append(attribute = MakeTool(new AttributeTool(new ControlInfo("Attribute", "T", "T")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(attr)), tg, _ed->MouseDocObservable(), mouse_attr)); _toolbars->append(vb); ! vb = layout.vbox(7); ! vb->append(select); vb->append(move); vb->append(reshape); --- 534,550 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(csplineComp, KLBL_CSPLINE,CODE_CSPLINE), csplineComp), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), layout.hcenter(gcspl)), ! _tg, _ed->MouseDocObservable(), mouse_cspl)); vb->append(MakeTool(new AnnotateTool(new ControlInfo("Annotate", "A", "A")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(anno)), _tg, _ed->MouseDocObservable(), mouse_anno)); vb->append(attribute = MakeTool(new AttributeTool(new ControlInfo("Attribute", "T", "T")), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(attr)), _tg, _ed->MouseDocObservable(), mouse_attr)); _toolbars->append(vb); ! vb = layout.vbox(); ! _toolbar_vbox[1] = vb; vb->append(select); vb->append(move); vb->append(reshape); *************** *** 554,560 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protoedge, "E","E"), protoedge), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gedge)), tg, _ed->MouseDocObservable(), mouse_edge)); SF_Ellipse* nellipse = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse->SetPattern(psnonepat); TextGraphic* ntext = new TextGraphic("___", stdgraphic); --- 556,562 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protoedge, "E","E"), protoedge), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gedge)), _tg, _ed->MouseDocObservable(), mouse_edge)); SF_Ellipse* nellipse = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse->SetPattern(psnonepat); TextGraphic* ntext = new TextGraphic("___", stdgraphic); *************** *** 563,569 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode, "N","N"), protonode), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod1)), tg, _ed->MouseDocObservable(), mouse_node)); SF_Ellipse* nellipse2 = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse2->SetPattern(psnonepat); TextGraphic* ntext2 = new TextGraphic("abc", stdgraphic); --- 565,571 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode, "N","N"), protonode), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod1)), _tg, _ed->MouseDocObservable(), mouse_node)); SF_Ellipse* nellipse2 = new SF_Ellipse(0, 0, unit, unit*3/5, stdgraphic); nellipse2->SetPattern(psnonepat); TextGraphic* ntext2 = new TextGraphic("abc", stdgraphic); *************** *** 572,578 **** vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode2, "L","L"), protonode2), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod2)), tg, _ed->MouseDocObservable(), mouse_lnode)); vb->append(attribute); _toolbars->append(vb); --- 574,580 ---- vb->append(MakeTool(new GraphicCompTool(new ControlInfo(protonode2, "L","L"), protonode2), layout.overlay(layout.hcenter(layout.hspace(maxwidth)), ! layout.hcenter(gnod2)), _tg, _ed->MouseDocObservable(), mouse_lnode)); vb->append(attribute); _toolbars->append(vb); Index: include_std/math.h diff -c include_std/math.h:1.1 include_std/math.h:1.2 *** include_std/math.h:1.1 Tue Jun 15 08:57:54 2004 --- src/include/ivstd/math.h Tue Oct 4 10:36:58 2005 *************** *** 4,9 **** --- 4,12 ---- #if defined(__cplusplus) #include_next <math.h> #else + #if defined(__APPLE__) + #define __DARWIN_UNIX03 1 + #endif #include </usr/include/math.h> #endif Index: include_std/stdlib.h diff -c include_std/stdlib.h:1.1 include_std/stdlib.h:1.2 *** include_std/stdlib.h:1.1 Tue Jun 15 08:57:54 2004 --- src/include/ivstd/stdlib.h Tue Oct 4 10:36:58 2005 *************** *** 5,11 **** #else #include </usr/include/stdlib.h> #endif ! #if defined(__APPLE__) typedef int socklen_t; #endif #endif --- 5,11 ---- #else #include </usr/include/stdlib.h> #endif ! #if defined(__APPLE__) && 0 typedef int socklen_t; #endif #endif Index: include_std/string.h diff -c include_std/string.h:1.1 include_std/string.h:1.2 *** include_std/string.h:1.1 Tue Jun 15 08:57:54 2004 --- src/include/ivstd/string.h Tue Oct 4 10:36:58 2005 *************** *** 32,35 **** --- 32,36 ---- #else #include </usr/include/string.h> #endif + #include <strings.h> #endif Index: scripts_ivtools/config.sub diff -c scripts_ivtools/config.sub:1.1 scripts_ivtools/config.sub:1.2 *** scripts_ivtools/config.sub:1.1 Tue Jun 15 08:57:57 2004 --- src/scripts/config.sub Tue Oct 4 10:36:59 2005 *************** *** 186,192 **** # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. ! i[34567]86) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. --- 186,192 ---- # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. ! i[34567]86|x86_64-*) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. Index: src_tiff/machdep.h diff -c src_tiff/machdep.h:1.1 src_tiff/machdep.h:1.2 *** src_tiff/machdep.h:1.1 Tue Jun 15 08:54:10 2004 --- src/TIFF/machdep.h Tue Oct 4 10:36:41 2005 *************** *** 51,57 **** #define IEEEFP /* IEEE floating point supported */ #endif /* transputer */ ! #if defined(m386) || defined(M_I86) || defined(i386) #define BIGENDIAN 0 #define IEEEFP /* IEEE floating point supported */ #endif /* m386 || M_I86 || i386 */ --- 51,57 ---- #define IEEEFP /* IEEE floating point supported */ #endif /* transputer */ ! #if defined(m386) || defined(M_I86) || defined(i386) || defined(__x64_64__) #define BIGENDIAN 0 #define IEEEFP /* IEEE floating point supported */ #endif /* m386 || M_I86 || i386 */ *** /dev/null Tue Oct 4 10:37:03 PDT 2005 --- patches/[email protected] *************** patches/[email protected] *** 0 **** --- 1 ---- + [email protected] --Apple-Mail-3--183171928-- ------------------------------------------------------- This SF.Net email is sponsored by: Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl