DR 1073

[pf3gnuchains/gcc-fork.git] / libobjc / memory.c

diff --git a/libobjc/memory.c b/libobjc/memory.c
index a0d6e13..b0519fc 100644 (file)
--- a/libobjc/memory.c
+++ b/libobjc/memory.c
@@ -24,11 +24,9 @@ a copy of the GCC Runtime Library Exception along with this program;
 see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 <http://www.gnu.org/licenses/>.  */
 
-/*
-  This file includes the standard functions for memory allocation and
-  disposal.  Users should use these functions in their ObjC programs
-  so that they work properly with garbage collectors.
-*/
+/* This file includes the standard functions for memory allocation and
+   disposal.  Users should use these functions in their ObjC programs
+   so that they work properly with garbage collectors.  */
 
 /* TODO: Turn these into macros or inline functions.  */
 
@@ -37,13 +35,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 
 /* __USE_FIXED_PROTOTYPES__ used to be required to get prototypes for
    malloc, free, etc. on some platforms.  It is unclear if we still
-   need it, but it can't hurt.
-*/
+   need it, but it can't hurt.  */
 #define __USE_FIXED_PROTOTYPES__
 #include <stdlib.h>
 
-#include "objc/objc.h"
-#include "objc/objc-api.h"
+#include "objc/runtime.h"
 
 #if OBJC_WITH_GC
 #include <gc.h>
@@ -164,11 +160,8 @@ objc_valloc (size_t size)
 
 #endif /* !OBJC_WITH_GC */
 
-/*
-  Hook functions for memory allocation and disposal.  Deprecated
-  and currently unused.
-*/
-
+/* Hook functions for memory allocation and disposal.  Deprecated and
+   currently unused.  */
 void *(*_objc_malloc) (size_t) = malloc;
 void *(*_objc_atomic_malloc) (size_t) = malloc;
 void *(*_objc_valloc) (size_t) = malloc;