summaryrefslogtreecommitdiff
path: root/ChangeLog-96b
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1996-12-17 18:23:27 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1996-12-17 18:23:27 +0000
commit7a6a01aa39d4ca371a460fb537b411003dbd49ae (patch)
tree93b6cacdee711a4aaf5b40a212ad41dca05b261c /ChangeLog-96b
parent8d218edb48abce645e9d05b4ef1edcea6a2b65f0 (diff)
downloadATCD-7a6a01aa39d4ca371a460fb537b411003dbd49ae.tar.gz
*** empty log message ***
Diffstat (limited to 'ChangeLog-96b')
-rw-r--r--ChangeLog-96b8
1 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b
index d867ad7a964..0e6a731564a 100644
--- a/ChangeLog-96b
+++ b/ChangeLog-96b
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog-96b
Tue Dec 17 04:27:07 1996 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
* ace/ReactorEx: Added a new feature to the ReactorEx. If we
@@ -76,7 +75,6 @@ Mon Dec 16 11:25:55 1996 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
braces to make the HP/UX compiler happy. Thanks to Kenny Want
for reporting this.
-=======
Mon Dec 16 12:56:43 1996 David L. Levine <levine@cs.wustl.edu>
* ace/OS.i: removed spurious "*/" after an #endif. Thanks to
@@ -95,6 +93,11 @@ Mon Dec 16 12:56:43 1996 David L. Levine <levine@cs.wustl.edu>
Removed "LIBS += -lm" from these Makefiles because it doesn't
appear to be necessary, and not all platforms have a libm.
+ * include/makeinclude/platform_sunos4_g++.GNU, platform_sunos5_g++.GNU,
+ platform_sunos5_x86_g++.GNU, platform_unixware_g++.GNU:
+ added -lm to LIBS because it was removed from the Makefiles, and
+ it's needed with g++.
+
* netsvcs/lib/Makefile: removed /pkg/gnu/lib dependencies. Thanks
to Per Andersson <Per.Andersson@hfera.ericsson.se> for pointing
this out.
@@ -123,7 +126,6 @@ Sun Dec 15 13:01:17 1996 David L. Levine <levine@cs.wustl.edu>
which causes a core dump with the g++/SunOS5.5 build if the string
is in the text segment.
->>>>>>> 4.110
Sun Dec 15 10:29:20 1996 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
* netsvcs/servers/svc.conf: Removed the "lib" prefix for the