Various DJGGP specific issues in /djgpp.

[bison.git] / src / uniqstr.h

diff --git a/src/uniqstr.h b/src/uniqstr.h
index 6dc7f3f84a53027e825654cd3b9d6f93c8537dcb..ab482bebab55dc5defcd565af79d7839ae61289b 100644 (file)
--- a/src/uniqstr.h
+++ b/src/uniqstr.h
@@ -1,5 +1,6 @@
 /* Keeping a unique copy of strings.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -15,8 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef UNIQSTR_H_
 # define UNIQSTR_H_
@@ -27,11 +28,11 @@
 
 typedef char const *uniqstr;
 
-/* Return the uniqstr for S.  */
-uniqstr uniqstr_new (char const *s);
+/* Return the uniqstr for STR.  */
+uniqstr uniqstr_new (char const *str);
 
-/* Two uniqstr have the same value iff they are the same.  */
-#define UNIQSTR_EQ(S1, S2) ((S1) == (S2))
+/* Two uniqstr values have the same value iff they are the same.  */
+#define UNIQSTR_EQ(USTR1, USTR2) ((USTR1) == (USTR2))
 
 /*--------------------------------------.
 | Initializing, destroying, debugging.  |
@@ -40,8 +41,8 @@ uniqstr uniqstr_new (char const *s);
 /* Create the string table.  */
 void uniqstrs_new (void);
 
-/* Die if S is not a uniqstr.  */
-void uniqstr_assert (const char *s);
+/* Die if STR is not a uniqstr.  */
+void uniqstr_assert (char const *str);
 
 /* Free all the memory allocated for symbols.  */
 void uniqstrs_free (void);