From ae9f830228de9cb1e0d64a9e1caa6bc0772a347e Mon Sep 17 00:00:00 2001
From: rmottola <rmottola@72102866-910b-0410-8b05-ffd578937521>
Date: Thu, 7 Nov 2013 14:41:58 +0000
Subject: [PATCH] Openbsd malloc.h warning fix.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37368 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog             | 7 +++++++
 Source/GSFormat.m     | 7 +++----
 Source/NSConnection.m | 4 +++-
 Source/NSException.m  | 4 +++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3eab0b927..a58a9e115 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-11-07 Riccardo Mottola <rm@gnu.org>
+
+	* Source/GSFormat.m
+	* Source/NSException.m
+	* Source/NSConnection.m
+	Openbsd malloc.h warning fix.
+
 2013-11-05 German Arias <germanandre@gmx.es>
 
 	* Source/NSUndoManager.m (-undoActionName): Try first with the name
diff --git a/Source/GSFormat.m b/Source/GSFormat.m
index be710bd68..c8c000a8d 100644
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@@ -1,5 +1,5 @@
 /** Implementation of GNUSTEP printf-style formatting
-   Copyright (C) 1994-2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1994-2000, 2001-2013 Free Software Foundation, Inc.
 
    Hacked together by Kai Henningsen <kai@cats.ms>
    from the glibc 2.2.1 sources
@@ -51,8 +51,10 @@
 #endif
 
 #ifdef HAVE_MALLOC_H
+#if !defined(__OpenBSD__)
 #include <malloc.h>
 #endif
+#endif
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
@@ -99,9 +101,6 @@ typedef uint32_t wint_t;
 #ifdef HAVE_SYS_INTTYPES_H
 #include <sys/inttypes.h>
 #endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 #ifndef HAVE_UINTMAX_T
 typedef unsigned long long uintmax_t;
 #endif
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index 70d6e672d..e52c9a5fc 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -1,5 +1,5 @@
 /** Implementation of connection object for remote object messaging
-   Copyright (C) 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
    Created by:  Andrew Kachites McCallum <mccallum@gnu.ai.mit.edu>
    Date: July 1994
@@ -73,8 +73,10 @@
 #define	EXPOSE_NSDistantObject_IVARS	1
 
 #ifdef HAVE_MALLOC_H
+#if !defined(__OpenBSD__)
 #include <malloc.h>
 #endif
+#endif
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
diff --git a/Source/NSException.m b/Source/NSException.m
index da8b50fbd..07ca655c7 100644
--- a/Source/NSException.m
+++ b/Source/NSException.m
@@ -1,5 +1,5 @@
 /** NSException - Object encapsulation of a general exception handler
-   Copyright (C) 1993, 1994, 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1993-2013 Free Software Foundation, Inc.
 
    Written by:  Adam Fedor <fedor@boulder.colorado.edu>
    Date: Mar 1995
@@ -48,8 +48,10 @@
 #endif
 
 #ifdef HAVE_MALLOC_H
+#if !defined(__OpenBSD__)
 #include <malloc.h>
 #endif
+#endif
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif