From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 11 Jul 2003 23:33:34 +0000 (+0000)
Subject: (__INT_TO_PTR): Revert change of 2003-03-13; it breaks C++ compilation.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57153f2edb8bf7c36241ea3ed2d7ccb1288560bc;p=pspp

(__INT_TO_PTR): Revert change of 2003-03-13; it breaks C++ compilation.
[!__GNUC__ || !__STDC__] (obstack_finish): Cast result to void*.
---

diff --git a/lib/obstack.h b/lib/obstack.h
index d5b856f6e3..67833e3f26 100644
--- 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
@@ -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)						\