diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-08 18:31:02 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-08 18:31:02 +0000 |
| commit | 90ba96f9909559d4784db51833f00e6609e5e192 (patch) | |
| tree | 4681ddaab1ca78e33515aa1597bae11de21afa70 /netsvcs | |
| parent | 01f8f024493ede3c7e020a718419f9c5a5d2f90a (diff) | |
| download | ATCD-90ba96f9909559d4784db51833f00e6609e5e192.tar.gz | |
removed the Linux/egcs hacks, because they're not necessary with Scott Snyder's egcs patch
Diffstat (limited to 'netsvcs')
| -rw-r--r-- | netsvcs/lib/Makefile | 23 | ||||
| -rw-r--r-- | netsvcs/lib/Server_Logging_Handler.cpp | 18 |
2 files changed, 4 insertions, 37 deletions
diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile index 928b8408f5e..b85221397d2 100644 --- a/netsvcs/lib/Makefile +++ b/netsvcs/lib/Makefile @@ -40,26 +40,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local targets #---------------------------------------------------------------------------- -ifeq ($(CXX),g++) - ifeq ($(shell uname),Linux) - ifeq ($(shell \ - g++ --version | grep egcs-1.0.1 | sed 's/.*\(egcs-1.0.1\).*/\1/'),\ - egcs-1.0.1) - # Build Server_Logging_Handler.so with g++ 2.7.2.3. egcs 1.0.1 - # raises an internal compiler error when trying to build it. This - # assumes that g++ 2.7.2.3 is still installed as /usr/bin/g++. - $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT): - /usr/bin/g++ -v `echo $(CCFLAGS) | sed 's/ -fno-exceptions//'` \ - -DACE_LINUX_EGCS $(CPPFLAGS) $(PTDIRS) -c -o $@ $< - endif # egcs-1.0.1 - endif # Linux -else # ! g++ - ifeq ($(SUPPRESS_DASH_G),1) - #### Build this target without -g on some platforms. - $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT): +ifeq ($(SUPPRESS_DASH_G),1) +#### Build this target without -g on some platforms. +$(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT): $(COMPILE-NO_DASH_G.cc) -o $@ $< - endif # SUPPRESS_DASH_G -endif # ! g++ +endif # SUPPRESS_DASH_G #---------------------------------------------------------------------------- # Dependencies diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp index ae06fa7d98e..6f80aa71fb8 100644 --- a/netsvcs/lib/Server_Logging_Handler.cpp +++ b/netsvcs/lib/Server_Logging_Handler.cpp @@ -106,24 +106,6 @@ template class ACE_Server_Logging_Handler_T<LOGGING_PEER_STREAM, u_long, ACE_NUL template class ACE_Svc_Handler<LOGGING_PEER_STREAM, ACE_SYNCH>; #endif /* ACE_HAS_THREADS */ -#if defined (ACE_LINUX_EGCS) - // See the comments in the Makefile about not being able to compile - // this file on Linux with egcs 1.0.1. The following are needed with - // the Server_Logging_Handler.so that is built by g++ 2.7.x, in order to - // link with the remainder of libnetsvcs.so built by egcs 1.0.1: - template class ACE_Svc_Handler<ACE_SOCK_Stream, ACE_INET_Addr, ACE_Null_Mutex, ACE_Null_Condition>; - template class ACE_Task<ACE_Null_Mutex, ACE_Null_Condition>; - template class ACE_Message_Queue<ACE_Null_Mutex, ACE_Null_Condition>; - template class ACE_Module<ACE_Null_Mutex, ACE_Null_Condition>; - template class ACE_Thru_Task<ACE_Null_Mutex, ACE_Null_Condition>; -# if defined (ACE_HAS_THREADS) - template class ACE_Task<ACE_Thread_Mutex, ACE_Condition_Thread_Mutex>; - template class ACE_Message_Queue<ACE_Thread_Mutex, ACE_Condition_Thread_Mutex>; - template class ACE_Module<ACE_Thread_Mutex, ACE_Condition_Thread_Mutex>; - template class ACE_Thru_Task<ACE_Thread_Mutex, ACE_Condition_Thread_Mutex>; -# endif /* ACE_HAS_THREADS */ -#endif /* ACE_LINUX_EGCS */ - template class ACE_Server_Logging_Handler<Synch_Static_Receiver>; template class ACE_Thr_Server_Logging_Handler<Synch_Static_Receiver>; template class ACE_Server_Logging_Handler<Synch_Receiver>; |