[Groff-commit] groff ./ChangeLog src/include/ptable.h src/incl...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/02/17 16:29:25

Modified files:
        .              : ChangeLog 
        src/include    : ptable.h 
Added files:
        src/include    : itable.h 

Log message:
        * src/include/ptable.h, src/include/itable.h
        (NEXT_PTABLE_SIZE_DEFINED): Use it to avoid multiple declaration
        of external symbol `next_ptable_size' (used by both header files).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.904&tr2=1.905&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/include/itable.h?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/include/ptable.h.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.904 groff/ChangeLog:1.905
--- groff/ChangeLog:1.904       Fri Feb 17 16:23:21 2006
+++ groff/ChangeLog     Fri Feb 17 16:29:25 2006
@@ -1,3 +1,9 @@
+2006-02-17  Werner LEMBERG  <address@hidden>
+
+       * src/include/ptable.h, src/include/itable.h
+       (NEXT_PTABLE_SIZE_DEFINED): Use it to avoid multiple declaration
+       of external symbol `next_ptable_size' (used by both header files).
+
 2006-02-15  Bruno Haible  <address@hidden>
 
        * src/include/font.h (struct glyphinfo): New class.
Index: groff/src/include/ptable.h
diff -u groff/src/include/ptable.h:1.7 groff/src/include/ptable.h:1.8
--- groff/src/include/ptable.h:1.7      Sat Feb 11 20:34:36 2006
+++ groff/src/include/ptable.h  Fri Feb 17 16:29:25 2006
@@ -45,9 +45,14 @@
 #define PASSOC(T) name2(T,_passoc)
 #define PTABLE_ITERATOR(T) name2(T,_ptable_iterator)
 
+// itable.h declares this too
+#ifndef NEXT_PTABLE_SIZE_DEFINED
+# define NEXT_PTABLE_SIZE_DEFINED
 extern unsigned next_ptable_size(unsigned);    // Return the first suitable
                                // hash table size greater than the given
                                // value.
+#endif
+
 extern unsigned long hash_string(const char *);        // Return a hash code 
of the
                                // given string.  The hash function is
                                // platform dependent.  */