From 967f56ad90a500948250616d98adbf79680c9072 Mon Sep 17 00:00:00 2001 From: fedor Date: Fri, 7 Mar 2003 22:02:40 +0000 Subject: [PATCH] Remove objc_EXPORT (put in libobjc.def instead) git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/libobjc/trunk@16150 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog.GNUstep | 7 +++++++ GNUmakefile | 2 +- init.c | 2 +- libobjc.def | 17 +++++++++++++---- objc/hash.h | 3 +-- objc/objc-api.h | 37 ++++++++++++++++++------------------- objc/runtime.h | 35 +++++++++++++++++------------------ 7 files changed, 58 insertions(+), 45 deletions(-) diff --git a/ChangeLog.GNUstep b/ChangeLog.GNUstep index 125e6ca..e10a2b0 100644 --- a/ChangeLog.GNUstep +++ b/ChangeLog.GNUstep @@ -1,3 +1,10 @@ +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. + 2003-02-23 Tom Koelman * thr-win32.c: Added objc_condition_win32_backend struct. diff --git a/GNUmakefile b/GNUmakefile index a86ded9..fa079f3 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-decls.h \ + objc.h objc-api.h \ NXConstStr.h Object.h \ Protocol.h encoding.h typedstream.h \ thr.h diff --git a/init.c b/init.c index 2ed7d79..39919fc 100644 --- a/init.c +++ b/init.c @@ -459,7 +459,7 @@ objc_init_statics (void) to gather the module pointers so that they may be processed by the initialization routines as soon as possible. */ -objc_DECLARE void +void __objc_exec_class (Module_t module) { /* Have we processed any constructors previously? This flag is used to diff --git a/libobjc.def b/libobjc.def index 8671ef2..b050f1b 100644 --- a/libobjc.def +++ b/libobjc.def @@ -24,13 +24,21 @@ search_for_method_in_list objc_get_uninstalled_dtable hash_is_key_in_hash objc_verror +_objc_lookup_class _objc_load_callback +__objc_msg_forward objc_malloc objc_atomic_malloc objc_valloc objc_realloc objc_calloc objc_free +_objc_malloc +_objc_atomic_malloc +_objc_valloc +_objc_realloc +_objc_calloc +_objc_free __objc_init_thread_system objc_mutex_allocate objc_mutex_deallocate @@ -50,9 +58,9 @@ objc_thread_remove __objc_class_name_Object __objc_class_name_Protocol objc_error -__objc_object_alloc -__objc_object_copy -__objc_object_dispose +_objc_object_alloc +_objc_object_copy +_objc_object_dispose class_create_instance object_copy object_dispose @@ -169,4 +177,5 @@ hash_new hash_next hash_remove hash_value_for_key -objc_set_error_handler \ No newline at end of file +objc_set_error_handler +class_ivar_set_gcinvisible diff --git a/objc/hash.h b/objc/hash.h index d3f52cb..e695012 100644 --- a/objc/hash.h +++ b/objc/hash.h @@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. */ #include #include -#include #include /* @@ -104,7 +103,7 @@ typedef struct cache /* Two important hash tables. */ -objc_EXPORT cache_ptr module_hash_table, class_hash_table; +extern cache_ptr module_hash_table, class_hash_table; /* Allocate and initialize a hash table. */ diff --git a/objc/objc-api.h b/objc/objc-api.h index 25df439..9268020 100644 --- a/objc/objc-api.h +++ b/objc/objc-api.h @@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */ #ifndef __objc_api_INCLUDE_GNU #define __objc_api_INCLUDE_GNU -#include "objc/objc-decls.h" #include "objc/objc.h" #include "objc/hash.h" #include "objc/thr.h" @@ -98,10 +97,10 @@ struct objc_method_description ** The third parameter is a format string in the printf style. ** The fourth parameter is a variable list of arguments. */ -objc_EXPORT void objc_error(id object, int code, const char* fmt, ...); -objc_EXPORT void objc_verror(id object, int code, const char* fmt, va_list ap); +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_EXPORT objc_error_handler objc_set_error_handler(objc_error_handler func); +objc_error_handler objc_set_error_handler(objc_error_handler func); /* ** Error codes @@ -137,7 +136,7 @@ objc_EXPORT objc_error_handler objc_set_error_handler(objc_error_handler func); ** Set this variable nonzero to print a line describing each ** message that is sent. (this is currently disabled) */ -objc_EXPORT BOOL objc_trace; +extern BOOL objc_trace; /* For every class which happens to have statically allocated instances in @@ -358,7 +357,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. */ -objc_EXPORT Class (*_objc_lookup_class)(const char *name); +extern Class (*_objc_lookup_class)(const char *name); /* ** This is a hook which is called by __objc_exec_class every time a class @@ -366,14 +365,14 @@ objc_EXPORT Class (*_objc_lookup_class)(const char *name); ** dynamic loader determine the classes that have been loaded when ** an object file is dynamically linked in. */ -objc_EXPORT void (*_objc_load_callback)(Class class, Category* category); +extern void (*_objc_load_callback)(Class class, Category* category); /* ** Hook functions for allocating, copying and disposing of instances */ -objc_EXPORT id (*_objc_object_alloc)(Class class); -objc_EXPORT id (*_objc_object_copy)(id object); -objc_EXPORT id (*_objc_object_dispose)(id object); +extern id (*_objc_object_alloc)(Class class); +extern id (*_objc_object_copy)(id object); +extern id (*_objc_object_dispose)(id object); /* ** Standard functions for memory allocation and disposal. @@ -409,19 +408,19 @@ objc_free(void *mem); ** Users should call the normal objc routines above for ** memory allocation and disposal within their programs. */ -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 *); +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 *); /* ** 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. */ -objc_EXPORT IMP (*__objc_msg_forward)(SEL); +extern IMP (*__objc_msg_forward)(SEL); Method_t class_get_class_method(MetaClass class, SEL aSel); @@ -454,7 +453,7 @@ SEL sel_register_typed_name(const char *name, const char*type); BOOL sel_is_mapped (SEL aSel); -objc_EXPORT id class_create_instance(Class class); +extern id class_create_instance(Class class); static inline const char * class_get_class_name(Class class) @@ -513,7 +512,7 @@ class_get_gc_object_type (Class class) } /* Mark the instance variable as innaccessible to the garbage collector */ -objc_EXPORT void class_ivar_set_gcinvisible (Class class, +extern void class_ivar_set_gcinvisible (Class class, const char* ivarname, BOOL gcInvisible); diff --git a/objc/runtime.h b/objc/runtime.h index 7b6d17a..ef72f06 100644 --- a/objc/runtime.h +++ b/objc/runtime.h @@ -42,37 +42,36 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "objc/hash.h" /* hash structures */ #include "objc/objc-list.h" /* linear lists */ -objc_EXPORT void __objc_add_class_to_hash(Class); /* (objc-class.c) */ -objc_EXPORT void __objc_init_selector_tables(void); /* (objc-sel.c) */ -objc_EXPORT void __objc_init_class_tables(void); /* (objc-class.c) */ -objc_EXPORT void __objc_init_dispatch_tables(void); /* (objc-dispatch.c) */ -objc_EXPORT void __objc_install_premature_dtable(Class); /* (objc-dispatch.c) */ -objc_EXPORT void __objc_resolve_class_links(void); /* (objc-class.c) */ -objc_EXPORT void __objc_register_selectors_from_class(Class); /* (objc-sel.c) */ -objc_EXPORT void __objc_update_dispatch_table_for_class (Class);/* (objc-msg.c) */ +extern void __objc_add_class_to_hash(Class); /* (objc-class.c) */ +extern void __objc_init_selector_tables(void); /* (objc-sel.c) */ +extern void __objc_init_class_tables(void); /* (objc-class.c) */ +extern void __objc_init_dispatch_tables(void); /* (objc-dispatch.c) */ +extern void __objc_install_premature_dtable(Class); /* (objc-dispatch.c) */ +extern void __objc_resolve_class_links(void); /* (objc-class.c) */ +extern void __objc_register_selectors_from_class(Class); /* (objc-sel.c) */ +extern void __objc_update_dispatch_table_for_class (Class);/* (objc-msg.c) */ -objc_EXPORT int __objc_init_thread_system(void); /* thread.c */ -objc_EXPORT int __objc_fini_thread_system(void); /* thread.c */ -objc_EXPORT void __objc_print_dtable_stats(void); /* sendmsg.c */ +extern int __objc_init_thread_system(void); /* thread.c */ +extern int __objc_fini_thread_system(void); /* thread.c */ +extern void __objc_print_dtable_stats(void); /* sendmsg.c */ -objc_EXPORT void class_add_method_list(Class, MethodList_t); +extern void class_add_method_list(Class, MethodList_t); /* Registering instance methods as class methods for root classes */ -objc_EXPORT void __objc_register_instance_methods_to_class(Class); -objc_EXPORT Method_t search_for_method_in_list(MethodList_t list, SEL op); +extern void __objc_register_instance_methods_to_class(Class); +extern Method_t search_for_method_in_list(MethodList_t list, SEL op); /* True when class links has been resolved */ -objc_EXPORT BOOL __objc_class_links_resolved; +extern BOOL __objc_class_links_resolved; /* Number of selectors stored in each of the selector tables */ -objc_EXPORT unsigned int __objc_selector_max_index; extern unsigned int __objc_selector_max_index; /* Mutex locking __objc_selector_max_index and its arrays. */ -objc_EXPORT objc_mutex_t __objc_runtime_mutex; +extern objc_mutex_t __objc_runtime_mutex; /* Number of threads which are alive. */ -objc_EXPORT int __objc_runtime_threads_alive; +extern int __objc_runtime_threads_alive; #ifdef DEBUG_RUNTIME #define DEBUG_PRINTF(format, args...) printf (format, ## args)