X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=libiberty%2Fxmalloc.c;h=3e97aab563f0e409a3d65a6258ee911e89101eb5;hb=95830fd17d6ae253d8f6c2595188cadd59058799;hp=ac1f6cb943223202e5fd7ccfd9b644089738094b;hpb=49b1fae4309ab5b9833f0af388483c2b6b4b3d50;p=deliverable%2Fbinutils-gdb.git

diff --git a/libiberty/xmalloc.c b/libiberty/xmalloc.c
index ac1f6cb943..3e97aab563 100644
--- a/libiberty/xmalloc.c
+++ b/libiberty/xmalloc.c
@@ -14,8 +14,8 @@ Library General Public License for more details.
 
 You should have received a copy of the GNU Library General Public
 License along with libiberty; see the file COPYING.LIB.  If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+not, write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /*
 
@@ -75,11 +75,23 @@ function will be called to print an error message and terminate execution.
 #include <unixlib.h>
 #else
 /* For systems with larger pointers than ints, these must be declared.  */
-PTR malloc (size_t);
-PTR realloc (PTR, size_t);
-PTR calloc (size_t, size_t);
-PTR sbrk (ptrdiff_t);
-#endif
+#  if HAVE_STDLIB_H && HAVE_UNISTD_H && HAVE_DECL_MALLOC \
+      && HAVE_DECL_REALLOC && HAVE_DECL_CALLOC && HAVE_DECL_SBRK
+#    include <stdlib.h>
+#    include <unistd.h>
+#  else
+#    ifdef __cplusplus
+extern "C" {
+#    endif /* __cplusplus */
+void *malloc (size_t);
+void *realloc (void *, size_t);
+void *calloc (size_t, size_t);
+void *sbrk (ptrdiff_t);
+#    ifdef __cplusplus
+}
+#    endif /* __cplusplus */
+#  endif /* HAVE_STDLIB_H ...  */
+#endif /* VMS */
 
 /* The program name if set.  */
 static const char *name = "";