Fixes for C++ reserved words

diff --git a/z39.50/Makefile.am b/z39.50/Makefile.am
index eb67387..30ae263 100644 (file)
--- a/z39.50/Makefile.am
+++ b/z39.50/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.8 2002-02-11 23:25:27 adam Exp $
+## $Id: Makefile.am,v 1.9 2002-02-12 21:11:49 adam Exp $
 
 INCLUDES=-I$(top_srcdir)/include
 
@@ -73,5 +73,5 @@ $(srcdir)/z.tcl $(srcdir)/esadmin.asn $(YAZCOMP)
        cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) esadmin.asn
 
 # Charset negotiation
-$(srcdir)/z-charneg.c : $(srcdir)/charneg-3.asn
+$(srcdir)/z-charneg.c: $(srcdir)/z.tcl $(srcdir)/charneg-3.asn
        cd $(srcdir); ../util/yaz-comp -d z.tcl -i yaz -I ../include $(YCFLAGS) charneg-3.asn

diff --git a/z39.50/z.tcl b/z39.50/z.tcl
index 7100253..919fd74 100644 (file)
--- a/z39.50/z.tcl
+++ b/z39.50/z.tcl
@@ -1,5 +1,5 @@
 # YC Sample Config File for Z39.50
-# $Id: z.tcl,v 1.6 2002-02-11 23:25:27 adam Exp $
+# $Id: z.tcl,v 1.7 2002-02-12 21:11:49 adam Exp $
 # ----------------------------------------------------------
 # Prefix Specifications
 #  
@@ -334,7 +334,8 @@ set map($m,TargetPart) ESAdminTargetPart
 # ----
 set m NegotiationRecordDefinition-charSetandLanguageNegotiation-3
 set filename($m) z-charneg
-
+set membermap($m,OriginProposal_0,private) {OriginProposal_0_private zprivate}
+set membermap($m,TargetResponse,private) {TargetResponse_private zprivate}
 # ----------------------------------------------------------
 # "Constructed" types defined by means of C-types are declared here.
 # Each function returns the C-handler and the C-type.