From patchwork Sun Dec 19 01:02:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: =?UTF-8?Q?libobjc:=20header=20cleanup=20for=20new=20API=20(3)?= Date: Sat, 18 Dec 2010 15:02:01 -0000 From: Nicola Pero X-Patchwork-Id: 76107 Message-Id: <1292720521.685120946@192.168.2.229> To: "gcc-patches@gnu.org" This patch adds missing objc_EXPORT to two header files that were added in GCC 4.6. Committed to trunk. Thanks Index: ChangeLog =================================================================== --- ChangeLog (revision 168040) +++ ChangeLog (working copy) @@ -1,5 +1,11 @@ 2010-12-19 Nicola Pero + * objc/objc-exception.h: Include objc-decls.h. Mark all + functions with objc_EXPORT. + * objc/objc-sync.h: Same change. + +2010-12-19 Nicola Pero + * Protocol.m: Moved all methods, with the exception of -isEqual:, into the 'Deprecated' category. * objc/Protocol.h: Removed all methods, moved to Index: objc/objc-exception.h =================================================================== --- objc/objc-exception.h (revision 168039) +++ objc/objc-exception.h (working copy) @@ -27,6 +27,7 @@ #define __objc_exception_INCLUDE_GNU #include "objc.h" +#include "objc-decls.h" #ifdef __cplusplus extern "C" { @@ -55,14 +56,12 @@ setting an 'objc_uncaught_exception_handler' function (using objc_set_uncaught_exception_handler(), see below); if one is set, it is executed before abort() is called. An uncaught exception - handler is expected to never return. - */ -void objc_exception_throw (id exception); + handler is expected to never return. */ +objc_EXPORT void objc_exception_throw (id exception); /* Compatibility note: the Apple/NeXT runtime seems to also have objc_exception_rethrow(), objc_begin_catch() and objc_end_catch(). - Currently the GNU runtime does not use them. -*/ + Currently the GNU runtime does not use them. */ /* The following functions allow customizing to a certain extent the exception handling. They are not thread safe and should be called @@ -70,8 +69,7 @@ are mostly reserved for "Foundation" libraries; in the case of GNUstep, GNUstep Base may be using these functions to improve the standard exception handling. You probably shouldn't use these - functions unless you are writing your own Foundation library. -*/ + functions unless you are writing your own Foundation library. */ /* Compatibility note: objc_set_exception_preprocessor() (available on the Apple/NeXT runtime) is not available on the GNU runtime. */ @@ -88,7 +86,7 @@ exception matcher function. This function is not safe to call in a multi-threaded environment because other threads may be trying to invoke the exception matcher while you change it! */ -objc_exception_matcher +objc_EXPORT objc_exception_matcher objc_setExceptionMatcher (objc_exception_matcher new_matcher); @@ -100,9 +98,8 @@ previous exception handler function. This function is not safe to call in a multi-threaded environment because other threads may be trying to invoke the uncaught exception handler while you change - it. -*/ -objc_uncaught_exception_handler + it. */ +objc_EXPORT objc_uncaught_exception_handler objc_setUncaughtExceptionHandler (objc_uncaught_exception_handler new_handler); #ifdef __cplusplus Index: objc/objc-sync.h =================================================================== --- objc/objc-sync.h (revision 168039) +++ objc/objc-sync.h (working copy) @@ -27,6 +27,7 @@ #define __objc_sync_INCLUDE_GNU #include "objc.h" +#include "objc-decls.h" #ifdef __cplusplus extern "C" { @@ -41,17 +42,15 @@ values. Note that you should not rely on the behaviour when 'object' is nil - because it could change. - */ -int objc_sync_enter (id object); + because it could change. */ +objc_EXPORT int objc_sync_enter (id object); /* 'objc_sync_exit' is automatically called when exiting from a @synchronized() block. It unlocks the recursive lock associated with 'object'. If 'object' is nil, it does nothing. It returns OBJC_SYNC_SUCCESS on success; see the enumeration below for error - values. - */ -int objc_sync_exit (id object); + values. */ +objc_EXPORT int objc_sync_exit (id object); /* All the possible return values for objc_sync_enter() and objc_sync_exit().