summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-04-23 21:48:13 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-04-23 21:48:13 +0000
commit1544b2d0c989e141954f6764389e3dc6403e5a7d (patch)
tree9623092fa7d05716d06ecb43a8d45b640699c192
parent531f8207adb685c1e6ca972583ecd8c9ec39d62e (diff)
downloadATCD-1544b2d0c989e141954f6764389e3dc6403e5a7d.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-98a3
-rw-r--r--TAO/ChangeLog-98c5
-rw-r--r--TAO/TAO_IDL/fe/Makefile2
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a
index 0c5f83a0018..2d4a5d529cc 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,5 +1,8 @@
Thu Apr 23 11:21:46 1998 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
+ * ace/Makefile (Svc_Conf_l.cpp): Added a -Pace_ prefix to the
+ lexer to avoid conflicts.
+
* apps/Gateway/Gateway/gatewayd.cpp,
apps/Gateway/Peer/peerd.cpp: Added a check to see if the
svc.conf file exists before trying to parse the arguments.
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 681b3340010..3280833a9a5 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,8 @@
+Thu Apr 23 16:20:58 1998 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
+
+ * TAO_IDL/fe/Makefile (LFLAGS): Added a -Ptao_ prefix
+ to the lexer to avoid conflicts.
+
Thu Apr 23 15:48:29 1998 Aniruddha Gokhale <gokhale@mambo.cs.wustl.edu>
* TAO_IDL/be/{be_visitor_structure, be_visitor_exception,
diff --git a/TAO/TAO_IDL/fe/Makefile b/TAO/TAO_IDL/fe/Makefile
index 31d8eb90e9e..0aa2c6b4ae7 100644
--- a/TAO/TAO_IDL/fe/Makefile
+++ b/TAO/TAO_IDL/fe/Makefile
@@ -57,7 +57,7 @@ CPPFLAGS += -D_REENTRANT -I../include -I. -DCPP_LOCATION=\"$(CXX)\" -DIDL_CFE_VE
YACC = yacc
LEX = flex
YFLAGS = -t -d
-LFLAGS = -t
+LFLAGS = -t -Ptao_
# Create the parser and lexer
y.tab.h y.tab.cpp: idl.yy