Tweak comments.

[gnulib.git] / lib / obstack.h

diff --git a/lib/obstack.h b/lib/obstack.h
index d5b856f..87bf2a3 100644 (file)
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -122,12 +122,8 @@ extern "C" {
 #endif
 
 #ifndef __INT_TO_PTR
-#if defined __STDC__ && __STDC__
-# define __INT_TO_PTR(P) ((void *) ((P) + (char *) 0))
-#else
 # define __INT_TO_PTR(P) ((P) + (char *) 0)
 #endif
-#endif
 
 /* We need the type of the resulting object.  If __PTRDIFF_TYPE__ is
    defined, as with GNU C, use that; that way we don't pollute the
@@ -296,17 +292,17 @@ extern int obstack_exit_failure;
 
 # define obstack_init(h)                                       \
   _obstack_begin ((h), 0, 0,                                   \
-                 (void *(*) (long)) obstack_chunk_alloc,       \
+                 (void *(*) (long)) obstack_chunk_alloc,       \
                  (void (*) (void *)) obstack_chunk_free)
 
 # define obstack_begin(h, size)                                        \
   _obstack_begin ((h), (size), 0,                              \
-                 (void *(*) (long)) obstack_chunk_alloc,       \
+                 (void *(*) (long)) obstack_chunk_alloc,       \
                  (void (*) (void *)) obstack_chunk_free)
 
 # define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
   _obstack_begin ((h), (size), (alignment),                               \
-                 (void *(*) (long)) (chunkfun),                           \
+                 (void *(*) (long)) (chunkfun),                           \
                  (void (*) (void *)) (freefun))
 
 # define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
@@ -324,7 +320,7 @@ extern int obstack_exit_failure;
 
 # define obstack_init(h)                                               \
   _obstack_begin ((h), 0, 0,                                           \
-                 (void *(*) ()) obstack_chunk_alloc,                   \
+                 (void *(*) ()) obstack_chunk_alloc,                   \
                  (void (*) ()) obstack_chunk_free)
 
 # define obstack_begin(h, size)                                                \
@@ -334,12 +330,12 @@ extern int obstack_exit_failure;
 
 # define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
   _obstack_begin ((h), (size), (alignment),                               \
-                 (void *(*) ()) (chunkfun),                               \
+                 (void *(*) ()) (chunkfun),                               \
                  (void (*) ()) (freefun))
 
 # define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
   _obstack_begin_1 ((h), (size), (alignment),                          \
-                   (void *(*) ()) (chunkfun),                          \
+                   (void *(*) ()) (chunkfun),                          \
                    (void (*) ()) (freefun), (arg))
 
 # define obstack_chunkfun(h, newchunkfun) \
@@ -476,7 +472,7 @@ __extension__                                                               \
 
 /* The local variable is named __o1 to avoid a name conflict
    when obstack_blank is called.  */
-# define obstack_finish(OBSTACK)                                       \
+# define obstack_finish(OBSTACK)                                       \
 __extension__                                                          \
 ({ struct obstack *__o1 = (OBSTACK);                                   \
    void *value;                                                                \
@@ -573,7 +569,7 @@ __extension__                                                               \
 # define obstack_copy0(h,where,length)                                 \
  (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
 
-# define obstack_finish(h)                                             \
+# define obstack_finish(h)                                             \
 ( ((h)->next_free == (h)->object_base                                  \
    ? (((h)->maybe_empty_object = 1), 0)                                        \
    : 0),                                                               \
@@ -585,7 +581,7 @@ __extension__                                                               \
     > (h)->chunk_limit - (char *) (h)->chunk)                          \
    ? ((h)->next_free = (h)->chunk_limit) : 0),                         \
   (h)->object_base = (h)->next_free,                                   \
-  __INT_TO_PTR ((h)->temp))
+  (void *) __INT_TO_PTR ((h)->temp))
 
 # if defined __STDC__ && __STDC__
 #  define obstack_free(h,obj)                                          \