summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-11-16 02:05:58 +0000
committercrodrigu <crodrigu@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-11-16 02:05:58 +0000
commit80410d46ecb2a3706e12859cc2080b5552f892d8 (patch)
treee3f1a3c813cb9c77970a6e30bc0c5ac8920a56b7
parent0a16d986f01261c5c4d988c11514a81eedb7b037 (diff)
downloadATCD-80410d46ecb2a3706e12859cc2080b5552f892d8.tar.gz
ChangeLogTag: Thu Nov 15 20:44:40 2001 Craig Rodrigues <crodrigu@bbn.com>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--ace/Makefile1
4 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 75654d53e7e..eade2d5cfea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 15 20:44:40 2001 Craig Rodrigues <crodrigu@bbn.com>
+
+ * etc/Svc_Conf_l.cpp.diff: Updated. Thanks to Kitty for reporting it.
+ * etc/Svc_Conf_y.cpp.diff: Added. We need it for uses of ACE_LIB_TEXT.
+ * ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp.
+
Thu Nov 15 08:26:57 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* ace/*.cpp: Changed all remaining uses of ACE_TEXT to ACE_LIB_TEXT
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 75654d53e7e..eade2d5cfea 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Thu Nov 15 20:44:40 2001 Craig Rodrigues <crodrigu@bbn.com>
+
+ * etc/Svc_Conf_l.cpp.diff: Updated. Thanks to Kitty for reporting it.
+ * etc/Svc_Conf_y.cpp.diff: Added. We need it for uses of ACE_LIB_TEXT.
+ * ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp.
+
Thu Nov 15 08:26:57 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* ace/*.cpp: Changed all remaining uses of ACE_TEXT to ACE_LIB_TEXT
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 75654d53e7e..eade2d5cfea 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Thu Nov 15 20:44:40 2001 Craig Rodrigues <crodrigu@bbn.com>
+
+ * etc/Svc_Conf_l.cpp.diff: Updated. Thanks to Kitty for reporting it.
+ * etc/Svc_Conf_y.cpp.diff: Added. We need it for uses of ACE_LIB_TEXT.
+ * ace/Makefile: Added rule to apply patch to Svc_Conf_y.cpp.
+
Thu Nov 15 08:26:57 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
* ace/*.cpp: Changed all remaining uses of ACE_TEXT to ACE_LIB_TEXT
diff --git a/ace/Makefile b/ace/Makefile
index 2e80ce799cf..fe845b1e039 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -539,6 +539,7 @@ Svc_Conf_y.cpp: Svc_Conf.y
-e "s/YY/ACE_YY/g" \
-e "s/Svc_Conf\.tab\.c/Svc_Conf_y.cpp/g" < Svc_Conf.tab.c > /tmp/$@; \
cp /tmp/$@ $@; \
+ patch < ../etc/Svc_Conf_y.cpp.diff; \
echo '// $$'\I\d'$$' > Svc_Conf_Tokens.h; \
cat Svc_Conf.tab.h >> Svc_Conf_Tokens.h; \
$(RM) -f /tmp/$@ Svc_Conf.tab.c Svc_Conf.tab.h Svc_Conf_y.cpp.orig; \