Patches to allow compilation of omniORB 2.2.0 on AIX 4.2 from Andrey Slepuhin of Moscow State University. Note that these patches have not been tested by ORL. See http://www.orl.co.uk/omniORB/bugs/5.html for more details. -------- To use: 1. Delete text in this file up to and including "cut here" line 2. cd {OMNIORB-INSTALL-DIRECTORY}/omniORB_2.2.0 3. patch -p1 < AIXpatches.txt 4. cd ./mk 5. ln -s powerpc_aix_4.2.mk config.mk 6. cd ../src 7. make install ------------------------------------------------------------------ Below there are patches needed to compile omniORB 2.2.0 on AIX 4.2 with C Set++ 3.1.4 (with some comments) Notes: 1) When shared libraries are to be created, they overwrite static versions, because in AIX shared objects can be inserted into archives. 2) I think that libraries can be build with GNU C without problems, but to compile multithreaded programs on AIX crt0_r.o must be linked instead crt0.o. C Set++ does this automatically if compiler invoked with _r suffix (xlC_r for example). For GNU C it can be done manually, but this is not convenient. 3) I don't know if these patches work for AIX version <4.2 (and I have not any machine such AIX version installed) 4) Please, read the patches carefully, may be you can find other solutions Best wishes, Andrey ----------------------cut here------------------------------------------------- diff -r -c -N omniORB_2.2.0.orig/include/omniORB2/CORBA_sysdep.h omniORB_2.2.0/include/omniORB2/CORBA_sysdep.h *** omniORB_2.2.0.orig/include/omniORB2/CORBA_sysdep.h Mon Aug 4 15:22:15 1997 --- omniORB_2.2.0/include/omniORB2/CORBA_sysdep.h Mon Aug 4 15:21:24 1997 *************** *** 112,117 **** --- 112,119 ---- #elif defined(__alpha__) #define _OMNIORB_HOST_BYTE_ORDER_ 1 #define _HAS_SIGNAL 1 + #elif defined(__powerpc__) + #define _OMNIORB_HOST_BYTE_ORDER_ 0 #elif defined(__sunos__) && defined(__sparc__) #define _OMNIORB_HOST_BYTE_ORDER_ 0 #define _HAS_SIGNAL 1 diff -r -c -N omniORB_2.2.0.orig/include/omnithread.h omniORB_2.2.0/include/omnithread.h *** omniORB_2.2.0.orig/include/omnithread.h Mon Aug 4 15:22:14 1997 --- omniORB_2.2.0/include/omnithread.h Mon Aug 4 15:21:24 1997 *************** *** 67,74 **** // implementation-specific members of the corresponding classes. // ! #if defined(__arm__) && defined(__atmos__) #include "omnithread/posix.h" #elif defined(__alpha__) && defined(__osf1__) --- 67,76 ---- // implementation-specific members of the corresponding classes. // + #if defined(__powerpc__) && defined(__aix__) + #include "omnithread/posix.h" ! #elif defined(__arm__) && defined(__atmos__) #include "omnithread/posix.h" #elif defined(__alpha__) && defined(__osf1__) diff -r -c -N omniORB_2.2.0.orig/mk/powerpc_aix_4.2.mk omniORB_2.2.0/mk/powerpc_aix_4.2.mk *** omniORB_2.2.0.orig/mk/powerpc_aix_4.2.mk Thu Jan 1 03:00:00 1970 --- omniORB_2.2.0/mk/powerpc_aix_4.2.mk Mon Aug 4 15:33:38 1997 *************** *** 0 **** --- 1,68 ---- + # + # powerpc_aix_4.2.mk - make variables and rules specific to AIX 4.2 on + # PowerPC. + # + + PLATFORM = powerpc_aix_4.2 + LIBDIR = $(TOP)/lib + BINDIR = $(TOP)/bin + + # + # C preprocessor macro definitions for this architecture + # + + PLATFORM_CPPFLAGS = -D__aix__ -D__powerpc__ -D__OSVERSION__=4.2 + + # + # Standard programs + # + + AR = ar cq + RANLIB = ranlib + MKDIRHIER = /usr/bin/X11/mkdirhier + CP = cp + MV = mv -f + RM = rm -f + + CXX = xlc_r + CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(CPPFLAGS) + CXXDEBUGFLAGS = + CXXOPTIONS = + CXXLINK = xlC_r + CXXLINKOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) + + CPPFLAGS = $(DIR_CPPFLAGS) $(PLATFORM_CPPFLAGS) + + + .SUFFIXES: .o .cc .C .cpp .cxx + + .cc.o: + $(CXX) -c $(CXXFLAGS) -o $@ $< + + .C.o: + $(CXX) -c $(CXXFLAGS) -o $@ $< + + .cpp.o: + $(CXX) -c $(CXXFLAGS) -o $@ $< + + .cxx.o: + $(CXX) -c $(CXXFLAGS) -o $@ $< + + + # I can't find pthread version anywhere, but after some attempts + # all compiles fine with -DPthreadDraftVersion=8 + OMNITHREAD_POSIX_CPPFLAGS = -DNoNanoSleep -DPthreadDraftVersion=8 + OMNITHREAD_CPPFLAGS = -I$(TOP)/include -D_REENTRANT + OMNITHREAD_LIB = -lomnithread -lpthreads + OMNITHREAD_STATIC_LIB = -lomnithread -lpthreads + + # Default location of the omniORB2 configuration file [falls back to this if + # the environment variable OMNIORB_CONFIG is not set] : + OMNIORB_CONFIG_DEFAULT_LOCATION = \"/etc/omniORB.cfg\" + + OMNIORB_CPPFLAGS = -D__OMNIORB2__ $(OMNITHREAD_CPPFLAGS) + OMNIORB_LIB = -lomniORB2 $(OMNITHREAD_LIB) + OMNIORB_STATIC_LIB = -lomniORB2 $(OMNITHREAD_STATIC_LIB) + + # Default directory for the omniNames log files. + OMNINAMES_LOG_DEFAULT_LOCATION = \"/var/omninames\" diff -r -c -N omniORB_2.2.0.orig/src/appl/omniNames/log.cc omniORB_2.2.0/src/appl/omniNames/log.cc *** omniORB_2.2.0.orig/src/appl/omniNames/log.cc Mon Aug 4 15:22:12 1997 --- omniORB_2.2.0/src/appl/omniNames/log.cc Mon Aug 4 15:21:21 1997 *************** *** 268,277 **** --- 268,279 ---- throw IOError(); // a bug on Solaris means that the fd doesn't get closed. + #ifndef __aix__ #if defined(__sunos__) && (__OSVERSION__ == 5) if (close(fd) < 0) throw IOError(); #endif + #endif } catch (IOError& ex) { cerr << ts.t() << "Error: cannot create initial log file '" << active *************** *** 500,509 **** --- 502,513 ---- throw IOError(); // a bug on Solaris means that the fd doesn't get closed. + #ifndef __aix__ #if defined(__sunos__) && (__OSVERSION__ == 5) if (close(fd) < 0) throw IOError(); #endif + #endif } catch (IOError& ex) { cerr << ts.t() << flush; *************** *** 511,519 **** --- 515,525 ---- cerr << "Abandoning checkpoint" << endl; ckpf.close(); // a bug on Solaris means that the fd doesn't get closed. + #ifndef __aix__ #if defined(__sunos__) && (__OSVERSION__ == 5) close(fd); #endif + #endif NamingContext_i::lock.readerOut(); unlink(checkpt); return; *************** *** 527,534 **** --- 533,542 ---- cerr << ts.t() << "Checkpointing Phase 2: Commit." << endl; // a bug on Solaris means that the fd doesn't get closed. + #ifndef __aix__ #if defined(__sunos__) && (__OSVERSION__ == 5) close(logf.rdbuf()->fd()); + #endif #endif logf.close(); diff -r -c -N omniORB_2.2.0.orig/src/appl/utils/nameclt/nameclt.cc omniORB_2.2.0/src/appl/utils/nameclt/nameclt.cc *** omniORB_2.2.0.orig/src/appl/utils/nameclt/nameclt.cc Mon Aug 4 15:22:14 1997 --- omniORB_2.2.0/src/appl/utils/nameclt/nameclt.cc Mon Aug 4 15:21:23 1997 *************** *** 188,195 **** do { for (unsigned int i = 0; i < bl->length(); i++) { ! cerr << "(" << (*bl)[i].binding_name[0].id << "," ! << (*bl)[i].binding_name[0].kind << ") binding type " << (((*bl)[i].binding_type == CosNaming::nobject) ? "nobject" : "ncontext") << endl; --- 188,195 ---- do { for (unsigned int i = 0; i < bl->length(); i++) { ! cerr << "(" << (char*)((*bl)[i].binding_name[0].id) << "," ! << (char*)((*bl)[i].binding_name[0].kind) << ") binding type " << (((*bl)[i].binding_type == CosNaming::nobject) ? "nobject" : "ncontext") << endl; diff -r -c -N omniORB_2.2.0.orig/src/examples/echo/greeting.cc omniORB_2.2.0/src/examples/echo/greeting.cc *** omniORB_2.2.0.orig/src/examples/echo/greeting.cc Mon Aug 4 15:22:10 1997 --- omniORB_2.2.0/src/examples/echo/greeting.cc Mon Aug 4 15:21:16 1997 *************** *** 25,30 **** dest = e->echoString(src); ! cerr << "I said,\"" << src << "\"." ! << " The Object said,\"" << dest <<"\"" << endl; } --- 25,30 ---- dest = e->echoString(src); ! cerr << "I said,\"" << (char*)src << "\"." ! << " The Object said,\"" << (char*)dest <<"\"" << endl; } diff -r -c -N omniORB_2.2.0.orig/src/lib/omniORB2/sharedlib/Makefile omniORB_2.2.0/src/lib/omniORB2/sharedlib/Makefile *** omniORB_2.2.0.orig/src/lib/omniORB2/sharedlib/Makefile Mon Aug 4 15:21:42 1997 --- omniORB_2.2.0/src/lib/omniORB2/sharedlib/Makefile Mon Aug 4 15:21:01 1997 *************** *** 46,52 **** NamingSK.o : ../../../../include/omniORB2/omniORB.h NamingSK.o : ../../../../include/omniORB2/templates.h NamingSK.o : ../../../../include/omniORB2/proxyFactory.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../NamingSK.cc constants.o : ../constants.cc constants.o : ../../../../include/omniORB2/CORBA.h --- 46,52 ---- NamingSK.o : ../../../../include/omniORB2/omniORB.h NamingSK.o : ../../../../include/omniORB2/templates.h NamingSK.o : ../../../../include/omniORB2/proxyFactory.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../NamingSK.cc constants.o : ../constants.cc constants.o : ../../../../include/omniORB2/CORBA.h *************** *** 70,76 **** constants.o : ../../../../include/omniORB2/templates.h constants.o : ../../../../include/omniORB2/proxyFactory.h constants.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../constants.cc corbaBoa.o : ../corbaBoa.cc corbaBoa.o : ../../../../include/omniORB2/CORBA.h --- 70,76 ---- constants.o : ../../../../include/omniORB2/templates.h constants.o : ../../../../include/omniORB2/proxyFactory.h constants.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../constants.cc corbaBoa.o : ../corbaBoa.cc corbaBoa.o : ../../../../include/omniORB2/CORBA.h *************** *** 95,101 **** corbaBoa.o : ../../../../include/omniORB2/proxyFactory.h corbaBoa.o : ../Naming.hh corbaBoa.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../corbaBoa.cc corbaObject.o : ../corbaObject.cc corbaObject.o : ../../../../include/omniORB2/CORBA.h --- 95,101 ---- corbaBoa.o : ../../../../include/omniORB2/proxyFactory.h corbaBoa.o : ../Naming.hh corbaBoa.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../corbaBoa.cc corbaObject.o : ../corbaObject.cc corbaObject.o : ../../../../include/omniORB2/CORBA.h *************** *** 120,126 **** corbaObject.o : ../../../../include/omniORB2/proxyFactory.h corbaObject.o : ../Naming.hh corbaObject.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../corbaObject.cc corbaOrb.o : ../corbaOrb.cc corbaOrb.o : ../../../../include/omniORB2/CORBA.h --- 120,126 ---- corbaObject.o : ../../../../include/omniORB2/proxyFactory.h corbaObject.o : ../Naming.hh corbaObject.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../corbaObject.cc corbaOrb.o : ../corbaOrb.cc corbaOrb.o : ../../../../include/omniORB2/CORBA.h *************** *** 145,151 **** corbaOrb.o : ../../../../include/omniORB2/proxyFactory.h corbaOrb.o : ../Naming.hh corbaOrb.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../corbaOrb.cc corbaString.o : ../corbaString.cc corbaString.o : ../../../../include/omniORB2/CORBA.h --- 145,151 ---- corbaOrb.o : ../../../../include/omniORB2/proxyFactory.h corbaOrb.o : ../Naming.hh corbaOrb.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../corbaOrb.cc corbaString.o : ../corbaString.cc corbaString.o : ../../../../include/omniORB2/CORBA.h *************** *** 170,176 **** corbaString.o : ../../../../include/omniORB2/proxyFactory.h corbaString.o : ../Naming.hh corbaString.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../corbaString.cc exception.o : ../exception.cc exception.o : ../../../../include/omniORB2/CORBA.h --- 170,176 ---- corbaString.o : ../../../../include/omniORB2/proxyFactory.h corbaString.o : ../Naming.hh corbaString.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../corbaString.cc exception.o : ../exception.cc exception.o : ../../../../include/omniORB2/CORBA.h *************** *** 195,201 **** exception.o : ../../../../include/omniORB2/proxyFactory.h exception.o : ../Naming.hh exception.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../exception.cc giopClient.o : ../giopClient.cc giopClient.o : ../../../../include/omniORB2/CORBA.h --- 195,201 ---- exception.o : ../../../../include/omniORB2/proxyFactory.h exception.o : ../Naming.hh exception.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../exception.cc giopClient.o : ../giopClient.cc giopClient.o : ../../../../include/omniORB2/CORBA.h *************** *** 220,226 **** giopClient.o : ../../../../include/omniORB2/proxyFactory.h giopClient.o : ../Naming.hh giopClient.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../giopClient.cc giopServer.o : ../giopServer.cc giopServer.o : ../../../../include/omniORB2/CORBA.h --- 220,226 ---- giopClient.o : ../../../../include/omniORB2/proxyFactory.h giopClient.o : ../Naming.hh giopClient.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../giopClient.cc giopServer.o : ../giopServer.cc giopServer.o : ../../../../include/omniORB2/CORBA.h *************** *** 245,251 **** giopServer.o : ../../../../include/omniORB2/proxyFactory.h giopServer.o : ../Naming.hh giopServer.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../giopServer.cc initFile.o : ../initFile.cc initFile.o : ../../../../include/omniORB2/CORBA.h --- 245,251 ---- giopServer.o : ../../../../include/omniORB2/proxyFactory.h giopServer.o : ../Naming.hh giopServer.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../giopServer.cc initFile.o : ../initFile.cc initFile.o : ../../../../include/omniORB2/CORBA.h *************** *** 270,276 **** initFile.o : ../../../../include/omniORB2/proxyFactory.h initFile.o : ../Naming.hh initFile.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../initFile.cc ior.o : ../ior.cc ior.o : ../../../../include/omniORB2/CORBA.h --- 270,276 ---- initFile.o : ../../../../include/omniORB2/proxyFactory.h initFile.o : ../Naming.hh initFile.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../initFile.cc ior.o : ../ior.cc ior.o : ../../../../include/omniORB2/CORBA.h *************** *** 295,301 **** ior.o : ../../../../include/omniORB2/proxyFactory.h ior.o : ../Naming.hh ior.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../ior.cc libcWrapper.o : ../libcWrapper.cc libcWrapper.o : ../../../../include/omniORB2/CORBA.h --- 295,301 ---- ior.o : ../../../../include/omniORB2/proxyFactory.h ior.o : ../Naming.hh ior.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../ior.cc libcWrapper.o : ../libcWrapper.cc libcWrapper.o : ../../../../include/omniORB2/CORBA.h *************** *** 321,327 **** libcWrapper.o : ../Naming.hh libcWrapper.o : ../../../../include/omniORB2/CORBA.h libcWrapper.o : ../libcWrapper.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../libcWrapper.cc mbufferedStream.o : ../mbufferedStream.cc mbufferedStream.o : ../../../../include/omniORB2/CORBA.h --- 321,327 ---- libcWrapper.o : ../Naming.hh libcWrapper.o : ../../../../include/omniORB2/CORBA.h libcWrapper.o : ../libcWrapper.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../libcWrapper.cc mbufferedStream.o : ../mbufferedStream.cc mbufferedStream.o : ../../../../include/omniORB2/CORBA.h *************** *** 346,352 **** mbufferedStream.o : ../../../../include/omniORB2/proxyFactory.h mbufferedStream.o : ../Naming.hh mbufferedStream.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../mbufferedStream.cc nbufferedStream.o : ../nbufferedStream.cc nbufferedStream.o : ../../../../include/omniORB2/CORBA.h --- 346,352 ---- mbufferedStream.o : ../../../../include/omniORB2/proxyFactory.h mbufferedStream.o : ../Naming.hh mbufferedStream.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../mbufferedStream.cc nbufferedStream.o : ../nbufferedStream.cc nbufferedStream.o : ../../../../include/omniORB2/CORBA.h *************** *** 371,377 **** nbufferedStream.o : ../../../../include/omniORB2/proxyFactory.h nbufferedStream.o : ../Naming.hh nbufferedStream.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../nbufferedStream.cc object.o : ../object.cc object.o : ../../../../include/omniORB2/CORBA.h --- 371,377 ---- nbufferedStream.o : ../../../../include/omniORB2/proxyFactory.h nbufferedStream.o : ../Naming.hh nbufferedStream.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../nbufferedStream.cc object.o : ../object.cc object.o : ../../../../include/omniORB2/CORBA.h *************** *** 396,402 **** object.o : ../../../../include/omniORB2/proxyFactory.h object.o : ../Naming.hh object.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../object.cc objectKey.o : ../objectKey.cc objectKey.o : ../../../../include/omniORB2/CORBA.h --- 396,402 ---- object.o : ../../../../include/omniORB2/proxyFactory.h object.o : ../Naming.hh object.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../object.cc objectKey.o : ../objectKey.cc objectKey.o : ../../../../include/omniORB2/CORBA.h *************** *** 421,427 **** objectKey.o : ../../../../include/omniORB2/proxyFactory.h objectKey.o : ../Naming.hh objectKey.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../objectKey.cc objectRef.o : ../objectRef.cc objectRef.o : ../../../../include/omniORB2/CORBA.h --- 421,427 ---- objectKey.o : ../../../../include/omniORB2/proxyFactory.h objectKey.o : ../Naming.hh objectKey.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../objectKey.cc objectRef.o : ../objectRef.cc objectRef.o : ../../../../include/omniORB2/CORBA.h *************** *** 447,453 **** objectRef.o : ../Naming.hh objectRef.o : ../../../../include/omniORB2/CORBA.h objectRef.o : ../../../../include/omniORB2/proxyFactory.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../objectRef.cc orb.o : ../orb.cc orb.o : ../../../../include/omniORB2/CORBA.h --- 447,453 ---- objectRef.o : ../Naming.hh objectRef.o : ../../../../include/omniORB2/CORBA.h objectRef.o : ../../../../include/omniORB2/proxyFactory.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../objectRef.cc orb.o : ../orb.cc orb.o : ../../../../include/omniORB2/CORBA.h *************** *** 473,479 **** orb.o : ../Naming.hh orb.o : ../../../../include/omniORB2/CORBA.h orb.o : ../tcpSocket_UNIX.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../orb.cc strand.o : ../strand.cc strand.o : ../../../../include/omniORB2/CORBA.h --- 473,479 ---- orb.o : ../Naming.hh orb.o : ../../../../include/omniORB2/CORBA.h orb.o : ../tcpSocket_UNIX.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../orb.cc strand.o : ../strand.cc strand.o : ../../../../include/omniORB2/CORBA.h *************** *** 498,504 **** strand.o : ../../../../include/omniORB2/proxyFactory.h strand.o : ../Naming.hh strand.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../strand.cc tcpSocket_UNIX.o : ../tcpSocket_UNIX.cc tcpSocket_UNIX.o : ../../../../include/omniORB2/CORBA.h --- 498,504 ---- strand.o : ../../../../include/omniORB2/proxyFactory.h strand.o : ../Naming.hh strand.o : ../../../../include/omniORB2/CORBA.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../strand.cc tcpSocket_UNIX.o : ../tcpSocket_UNIX.cc tcpSocket_UNIX.o : ../../../../include/omniORB2/CORBA.h *************** *** 525,531 **** tcpSocket_UNIX.o : ../../../../include/omniORB2/CORBA.h tcpSocket_UNIX.o : ../tcpSocket_UNIX.h tcpSocket_UNIX.o : ../libcWrapper.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../tcpSocket_UNIX.cc unshared.o : ../unshared.cc unshared.o : ../../../../include/omniORB2/CORBA.h --- 525,531 ---- tcpSocket_UNIX.o : ../../../../include/omniORB2/CORBA.h tcpSocket_UNIX.o : ../tcpSocket_UNIX.h tcpSocket_UNIX.o : ../libcWrapper.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../tcpSocket_UNIX.cc unshared.o : ../unshared.cc unshared.o : ../../../../include/omniORB2/CORBA.h *************** *** 552,556 **** unshared.o : ../../../../include/omniORB2/CORBA.h unshared.o : ../libcWrapper.h unshared.o : ../tcpSocket_UNIX.h ! $(CXX) -c $< $(CXXFLAGS) -o $@ ../unshared.cc --- 552,556 ---- unshared.o : ../../../../include/omniORB2/CORBA.h unshared.o : ../libcWrapper.h unshared.o : ../tcpSocket_UNIX.h ! $(CXX) -c $(CXXFLAGS) -o $@ ../unshared.cc diff -r -c -N omniORB_2.2.0.orig/src/lib/omniORB2/sharedlib/powerpc_aix_4.2.mk omniORB_2.2.0/src/lib/omniORB2/sharedlib/powerpc_aix_4.2.mk *** omniORB_2.2.0.orig/src/lib/omniORB2/sharedlib/powerpc_aix_4.2.mk Thu Jan 1 03:00:00 1970 --- omniORB_2.2.0/src/lib/omniORB2/sharedlib/powerpc_aix_4.2.mk Mon Aug 4 15:21:01 1997 *************** *** 0 **** --- 1,23 ---- + all:: libomniORB2.so.2.0 + + libomniORB2.so.2.0: $(ORB2_OBJS) + (set -x; \ + $(RM) $@; \ + makeC++SharedLib \ + -o $@ \ + -L$(LIBDIR) $(OMNITHREAD_LIB) \ + -lpthreads -lC -lc_r -lc -p 40 $(ORB2_OBJS); \ + ) + + clean:: + $(RM) *.o core + $(RM) libomniORB2.so.2.0 + + install:: libomniORB2.so.2.0 + @(set -x; \ + $(MKDIRHIER) $(LIBDIR); \ + $(CP) libomniORB2.so.2.0 $(LIBDIR); \ + cd $(LIBDIR); \ + $(RM) libomniORB2.a; \ + ar -rv libomniORB2.a libomniORB2.so.2.0; \ + ) diff -r -c -N omniORB_2.2.0.orig/src/lib/omniORB2/tcpSocket_UNIX.cc omniORB_2.2.0/src/lib/omniORB2/tcpSocket_UNIX.cc *** omniORB_2.2.0.orig/src/lib/omniORB2/tcpSocket_UNIX.cc Mon Aug 4 15:21:38 1997 --- omniORB_2.2.0/src/lib/omniORB2/tcpSocket_UNIX.cc Mon Aug 4 15:20:59 1997 *************** *** 50,58 **** --- 50,60 ---- #include "libcWrapper.h" + #if !defined(__aix__) #if defined(__sunos__) && __OSVERSION__ == 5 extern "C" int gethostname(char *name, int namelen); #endif + #endif #define DO_NOT_AVOID_MISALIGNMENT *************** *** 657,663 **** } { ! #if defined(__GLIBC__) && __GLIBC__ >= 2 // GNU C library uses size_t* instead of int* in getsockname(). // This is suppose to be compatible with the upcoming POSIX standard. size_t l; --- 659,665 ---- } { ! #if defined(__aix__) || (defined(__GLIBC__) && __GLIBC__ >= 2) // GNU C library uses size_t* instead of int* in getsockname(). // This is suppose to be compatible with the upcoming POSIX standard. size_t l; *************** *** 724,730 **** tcpSocketHandle_t new_sock; struct sockaddr_in raddr; ! #if defined(__GLIBC__) && __GLIBC__ >= 2 // GNU C library uses size_t* instead of int* in accept(). // This is suppose to be compatible with the upcoming POSIX standard. size_t l; --- 726,732 ---- tcpSocketHandle_t new_sock; struct sockaddr_in raddr; ! #if defined(__aix__) || (defined(__GLIBC__) && __GLIBC__ >= 2) // GNU C library uses size_t* instead of int* in accept(). // This is suppose to be compatible with the upcoming POSIX standard. size_t l; diff -r -c -N omniORB_2.2.0.orig/src/lib/omnithread/posix.cc omniORB_2.2.0/src/lib/omnithread/posix.cc *** omniORB_2.2.0.orig/src/lib/omnithread/posix.cc Mon Aug 4 15:21:32 1997 --- omniORB_2.2.0/src/lib/omnithread/posix.cc Mon Aug 4 15:20:59 1997 *************** *** 928,934 **** #if defined(__osf1__) && defined(__alpha__) if (pthread_delay_np(&rqts) != 0) return errno; ! #elif defined(__linux__) if (secs > 2000) { sleep(secs); } else { --- 928,934 ---- #if defined(__osf1__) && defined(__alpha__) if (pthread_delay_np(&rqts) != 0) return errno; ! #elif defined(__linux__) || defined (__aix__) if (secs > 2000) { sleep(secs); } else { *************** *** 953,959 **** rc = ERRNO(pthread_get_expiration_np(&rel, &abs)); #else timespec abs; ! #ifdef __linux__ struct timeval tv; gettimeofday(&tv, NULL); abs.tv_sec = tv.tv_sec; --- 953,959 ---- rc = ERRNO(pthread_get_expiration_np(&rel, &abs)); #else timespec abs; ! #if defined(__linux__) || defined(__aix__) struct timeval tv; gettimeofday(&tv, NULL); abs.tv_sec = tv.tv_sec; diff -r -c -N omniORB_2.2.0.orig/src/lib/omnithread/sharedlib/powerpc_aix_4.2.mk omniORB_2.2.0/src/lib/omnithread/sharedlib/powerpc_aix_4.2.mk *** omniORB_2.2.0.orig/src/lib/omnithread/sharedlib/powerpc_aix_4.2.mk Thu Jan 1 03:00:00 1970 --- omniORB_2.2.0/src/lib/omnithread/sharedlib/powerpc_aix_4.2.mk Mon Aug 4 15:20:59 1997 *************** *** 0 **** --- 1,31 ---- + OBJS = posix.o + LIBS = -lpthread + DIR_CPPFLAGS = $(OMNITHREAD_CPPFLAGS) $(OMNITHREAD_POSIX_CPPFLAGS) + + all:: libomnithread.so.1.0 + + libomnithread.so.1.0: $(OBJS) + (set -x; \ + $(RM) $@; \ + makeC++SharedLib \ + -o $@ \ + -lpthreads -lC -lc_r -lc -p 40 $(OBJS); \ + ) + + clean:: + $(RM) *.o core + $(RM) libomnithread.so.1.0 + + install:: libomnithread.so.1.0 + @(set -x; \ + $(MKDIRHIER) $(LIBDIR); \ + $(CP) libomnithread.so.1.0 $(LIBDIR); \ + cd $(LIBDIR); \ + $(RM) libomnithread.a; \ + ar -rv -s libomnithread.a libomnithread.so.1.0; \ + ) + + + posix.o: ../posix.cc + $(CXX) -c $(CXXFLAGS) -o $@ ../posix.cc + diff -r -c -N omniORB_2.2.0.orig/src/tool/omniidl2/driver/drv_fork.cc omniORB_2.2.0/src/tool/omniidl2/driver/drv_fork.cc *** omniORB_2.2.0.orig/src/tool/omniidl2/driver/drv_fork.cc Mon Aug 4 15:21:48 1997 --- omniORB_2.2.0/src/tool/omniidl2/driver/drv_fork.cc Mon Aug 4 15:21:06 1997 *************** *** 97,102 **** --- 97,107 ---- #include // POSIX definition of wait() #endif // defined(hpux) || defined(__hpux) + #if defined(__aix__) + #include // POSIX standard types + #include // POSIX definition of wait() + #endif + #ifndef __NT__