* src/conflicts.c (conflict_report): New function.

[bison.git] / src / alloc.h

diff --git a/src/alloc.h b/src/alloc.h
index b944628eea1a48ec7bf612bc0857fa66376d241b..9685122e2e31b63342f8faf14f8ef7fc3d25033d 100644 (file)
--- a/src/alloc.h
+++ b/src/alloc.h
@@ -15,17 +15,22 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with Bison; see the file COPYING.  If not, write to
 
 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */

 
 
 
 

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #define        NEW(t)          ((t *) xmalloc((unsigned) sizeof(t)))
 #define        NEW2(n, t)      ((t *) xmalloc((unsigned) ((n) * sizeof(t))))
 
 #ifdef __STDC__
 #define        FREE(x)         (x ? (void) free((char *) (x)) : (void)0)
 #else
 #define        NEW(t)          ((t *) xmalloc((unsigned) sizeof(t)))
 #define        NEW2(n, t)      ((t *) xmalloc((unsigned) ((n) * sizeof(t))))
 
 #ifdef __STDC__
 #define        FREE(x)         (x ? (void) free((char *) (x)) : (void)0)
 #else

-#define        FREE(x)         (x && free((char *) (x)))
+#define FREE(x)        ((x) != 0 && (free ((char *) (x)), 0))

 #endif
 
 #endif
 

-extern char *xmalloc();
-extern char *xrealloc();
+extern char *xmalloc  PARAMS((register unsigned));
+extern char *xrealloc PARAMS((register char *, register unsigned));