# HG changeset patch # User Roland McGrath # Date 752978475 0 # Node ID 4e5081dcfc25954ffdbbaec8cd4028baed00e65b # Parent 2d729d1bd6437b71b3cf584c30cc35688caa4138 [! HPUX]: Don't declare sbrk at all, so as not to conflict with headers. diff -r 2d729d1bd643 -r 4e5081dcfc25 src/unexec.c --- a/src/unexec.c Wed Nov 10 22:56:45 1993 +0000 +++ b/src/unexec.c Thu Nov 11 00:41:15 1993 +0000 @@ -1,10 +1,10 @@ -/* Copyright (C) 1985, 1986, 1987, 1988, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993 Free Software Foundation, Inc. This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, @@ -210,11 +210,18 @@ #ifdef HPUX extern void *sbrk (); #else +#if 0 +/* Some systems with __STDC__ compilers still declare this `char *' in some + header file, and our declaration conflicts. The return value is always + cast, so it should be harmless to leave it undefined. Hopefully + machines with different size pointers and ints declare sbrk in a header + file. */ #ifdef __STDC__ extern void *sbrk (); #else extern char *sbrk (); #endif /* __STDC__ */ +#endif #endif /* HPUX */ #define SYMS_START ((long) N_SYMOFF (ohdr))