From ce5c7dd302c1fdadef82cd8e744bea0fd88a79e0 Mon Sep 17 00:00:00 2001 From: fedor Date: Fri, 7 Mar 2003 23:24:19 +0000 Subject: [PATCH] Put back objc_EXPORT in variables git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/libobjc/trunk@16151 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog.GNUstep | 4 ++-- GNUmakefile | 2 +- objc/objc-api.h | 27 ++++++++++++++------------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ChangeLog.GNUstep b/ChangeLog.GNUstep index e10a2b0..593d733 100644 --- a/ChangeLog.GNUstep +++ b/ChangeLog.GNUstep @@ -1,9 +1,9 @@ 2003-03-07 Adam Fedor - * GNUmakefile (libobjc_HEADER_FILES): Remove objc-decls.h * libobjc.def: Add some symbols * objc/hash.h: Remove objc_EXPORT prefixes - * objc/objc-api.h, objc/runtime.h: Idem. + * objc/runtime.h: Idem. + * objc/objc-api.h: Remove objc_EXPORT from functions. 2003-02-23 Tom Koelman diff --git a/GNUmakefile b/GNUmakefile index fa079f3..a86ded9 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -69,7 +69,7 @@ GC_HEADER_FILES = \ libobjc_HEADER_FILES = \ hash.h objc-list.h sarray.h \ - objc.h objc-api.h \ + objc.h objc-api.h objc-decls.h \ NXConstStr.h Object.h \ Protocol.h encoding.h typedstream.h \ thr.h diff --git a/objc/objc-api.h b/objc/objc-api.h index 9268020..e919b42 100644 --- a/objc/objc-api.h +++ b/objc/objc-api.h @@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ #include "objc/objc.h" #include "objc/hash.h" #include "objc/thr.h" +#include "objc/objc-decls.h" #include #include @@ -100,7 +101,7 @@ struct objc_method_description extern void objc_error(id object, int code, const char* fmt, ...); extern void objc_verror(id object, int code, const char* fmt, va_list ap); typedef BOOL (*objc_error_handler)(id, int code, const char *fmt, va_list ap); -objc_error_handler objc_set_error_handler(objc_error_handler func); +extern objc_error_handler objc_set_error_handler(objc_error_handler func); /* ** Error codes @@ -357,7 +358,7 @@ retval_t objc_msg_sendv(id, SEL, arglist_t); ** This may e.g. try to load in the class using dynamic loading. ** The function is guaranteed to be passed a non-NULL name string. */ -extern Class (*_objc_lookup_class)(const char *name); +objc_EXPORT Class (*_objc_lookup_class)(const char *name); /* ** This is a hook which is called by __objc_exec_class every time a class @@ -365,14 +366,14 @@ extern Class (*_objc_lookup_class)(const char *name); ** dynamic loader determine the classes that have been loaded when ** an object file is dynamically linked in. */ -extern void (*_objc_load_callback)(Class class, Category* category); +objc_EXPORT void (*_objc_load_callback)(Class class, Category* category); /* ** Hook functions for allocating, copying and disposing of instances */ -extern id (*_objc_object_alloc)(Class class); -extern id (*_objc_object_copy)(id object); -extern id (*_objc_object_dispose)(id object); +objc_EXPORT id (*_objc_object_alloc)(Class class); +objc_EXPORT id (*_objc_object_copy)(id object); +objc_EXPORT id (*_objc_object_dispose)(id object); /* ** Standard functions for memory allocation and disposal. @@ -408,19 +409,19 @@ objc_free(void *mem); ** Users should call the normal objc routines above for ** memory allocation and disposal within their programs. */ -extern void *(*_objc_malloc)(size_t); -extern void *(*_objc_atomic_malloc)(size_t); -extern void *(*_objc_valloc)(size_t); -extern void *(*_objc_realloc)(void *, size_t); -extern void *(*_objc_calloc)(size_t, size_t); -extern void (*_objc_free)(void *); +objc_EXPORT void *(*_objc_malloc)(size_t); +objc_EXPORT void *(*_objc_atomic_malloc)(size_t); +objc_EXPORT void *(*_objc_valloc)(size_t); +objc_EXPORT void *(*_objc_realloc)(void *, size_t); +objc_EXPORT void *(*_objc_calloc)(size_t, size_t); +objc_EXPORT void (*_objc_free)(void *); /* ** Hook for method forwarding. This makes it easy to substitute a ** library, such as ffcall, that implements closures, thereby avoiding ** gcc's __builtin_apply problems. */ -extern IMP (*__objc_msg_forward)(SEL); +objc_EXPORT IMP (*__objc_msg_forward)(SEL); Method_t class_get_class_method(MetaClass class, SEL aSel);