[libdispatch-changes] [186] trunk/dispatch
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 17 21:49:14 PST 2010
Revision: 186
http://trac.macosforge.org/projects/libdispatch/changeset/186
Author: kvv at apple.com
Date: 2010-02-17 21:49:14 -0800 (Wed, 17 Feb 2010)
Log Message:
-----------
define DISPATCH_FORMAT attribute guard
define NSEC_PER_MSEC macro
add DISPATCH_EXPORT to globals
Modified Paths:
--------------
trunk/dispatch/base.h
trunk/dispatch/dispatch.h
trunk/dispatch/object.h
trunk/dispatch/queue.h
trunk/dispatch/source.h
trunk/dispatch/time.h
Modified: trunk/dispatch/base.h
===================================================================
--- trunk/dispatch/base.h 2010-02-18 05:44:47 UTC (rev 185)
+++ trunk/dispatch/base.h 2010-02-18 05:49:14 UTC (rev 186)
@@ -79,6 +79,7 @@
#define DISPATCH_PURE __attribute__((__pure__))
#define DISPATCH_WARN_RESULT __attribute__((__warn_unused_result__))
#define DISPATCH_MALLOC __attribute__((__malloc__))
+#define DISPATCH_FORMAT(...) __attribute__((__format__(__VA_ARGS__)))
#else
/*! @parseOnly */
#define DISPATCH_NORETURN
@@ -108,6 +109,8 @@
#define DISPATCH_WARN_RESULT
/*! @parseOnly */
#define DISPATCH_MALLOC
+/*! @parseOnly */
+#define DISPATCH_FORMAT(...)
#endif
#if __GNUC__
Modified: trunk/dispatch/dispatch.h
===================================================================
--- trunk/dispatch/dispatch.h 2010-02-18 05:44:47 UTC (rev 185)
+++ trunk/dispatch/dispatch.h 2010-02-18 05:49:14 UTC (rev 186)
@@ -25,15 +25,21 @@
#include <Availability.h>
#include <TargetConditionals.h>
#endif
+#if HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
#include <stddef.h>
#include <stdint.h>
#include <stdbool.h>
#include <stdarg.h>
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#if defined(__cplusplus)
#define __DISPATCH_BEGIN_DECLS extern "C" {
#define __DISPATCH_END_DECLS }
-#else
+#else
#define __DISPATCH_BEGIN_DECLS
#define __DISPATCH_END_DECLS
#endif
Modified: trunk/dispatch/object.h
===================================================================
--- trunk/dispatch/object.h 2010-02-18 05:44:47 UTC (rev 185)
+++ trunk/dispatch/object.h 2010-02-18 05:49:14 UTC (rev 186)
@@ -41,12 +41,12 @@
* The message to log above and beyond the introspection.
*/
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,3)))
+DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW DISPATCH_FORMAT(printf,2,3)
void
dispatch_debug(dispatch_object_t object, const char *message, ...);
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW __attribute__((__format__(printf,2,0)))
+DISPATCH_EXPORT DISPATCH_NONNULL2 DISPATCH_NOTHROW DISPATCH_FORMAT(printf,2,0)
void
dispatch_debugv(dispatch_object_t object, const char *message, va_list ap);
Modified: trunk/dispatch/queue.h
===================================================================
--- trunk/dispatch/queue.h 2010-02-18 05:44:47 UTC (rev 185)
+++ trunk/dispatch/queue.h 2010-02-18 05:49:14 UTC (rev 186)
@@ -346,7 +346,7 @@
* the main thread before main() is called.
*/
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern struct dispatch_queue_s _dispatch_main_q;
+DISPATCH_EXPORT struct dispatch_queue_s _dispatch_main_q;
#define dispatch_get_main_queue() (&_dispatch_main_q)
/*!
Modified: trunk/dispatch/source.h
===================================================================
--- trunk/dispatch/source.h 2010-02-18 05:44:47 UTC (rev 185)
+++ trunk/dispatch/source.h 2010-02-18 05:49:14 UTC (rev 186)
@@ -73,7 +73,8 @@
*/
#define DISPATCH_SOURCE_TYPE_DATA_ADD (&_dispatch_source_type_data_add)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_data_add;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_data_add;
/*!
* @const DISPATCH_SOURCE_TYPE_DATA_OR
@@ -85,7 +86,8 @@
*/
#define DISPATCH_SOURCE_TYPE_DATA_OR (&_dispatch_source_type_data_or)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_data_or;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_data_or;
/*!
* @const DISPATCH_SOURCE_TYPE_MACH_SEND
@@ -96,7 +98,8 @@
*/
#define DISPATCH_SOURCE_TYPE_MACH_SEND (&_dispatch_source_type_mach_send)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_mach_send;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_mach_send;
/*!
* @const DISPATCH_SOURCE_TYPE_MACH_RECV
@@ -106,7 +109,8 @@
*/
#define DISPATCH_SOURCE_TYPE_MACH_RECV (&_dispatch_source_type_mach_recv)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_mach_recv;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_mach_recv;
/*!
* @const DISPATCH_SOURCE_TYPE_PROC
@@ -117,7 +121,8 @@
*/
#define DISPATCH_SOURCE_TYPE_PROC (&_dispatch_source_type_proc)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_proc;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_proc;
/*!
* @const DISPATCH_SOURCE_TYPE_READ
@@ -128,7 +133,8 @@
*/
#define DISPATCH_SOURCE_TYPE_READ (&_dispatch_source_type_read)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_read;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_read;
/*!
* @const DISPATCH_SOURCE_TYPE_SIGNAL
@@ -138,7 +144,8 @@
*/
#define DISPATCH_SOURCE_TYPE_SIGNAL (&_dispatch_source_type_signal)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_signal;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_signal;
/*!
* @const DISPATCH_SOURCE_TYPE_TIMER
@@ -149,7 +156,8 @@
*/
#define DISPATCH_SOURCE_TYPE_TIMER (&_dispatch_source_type_timer)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_timer;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_timer;
/*!
* @const DISPATCH_SOURCE_TYPE_VNODE
@@ -160,7 +168,8 @@
*/
#define DISPATCH_SOURCE_TYPE_VNODE (&_dispatch_source_type_vnode)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_vnode;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_vnode;
/*!
* @const DISPATCH_SOURCE_TYPE_WRITE
@@ -171,7 +180,8 @@
*/
#define DISPATCH_SOURCE_TYPE_WRITE (&_dispatch_source_type_write)
__OSX_AVAILABLE_STARTING(__MAC_10_6,__IPHONE_NA)
-extern const struct dispatch_source_type_s _dispatch_source_type_write;
+DISPATCH_EXPORT
+const struct dispatch_source_type_s _dispatch_source_type_write;
/*!
* @enum dispatch_source_mach_send_flags_t
Modified: trunk/dispatch/time.h
===================================================================
--- trunk/dispatch/time.h 2010-02-18 05:44:47 UTC (rev 185)
+++ trunk/dispatch/time.h 2010-02-18 05:49:14 UTC (rev 186)
@@ -42,7 +42,11 @@
#ifdef NSEC_PER_USEC
#undef NSEC_PER_USEC
#endif
+#ifdef NSEC_PER_MSEC
+#undef NSEC_PER_MSEC
+#endif
#define NSEC_PER_SEC 1000000000ull
+#define NSEC_PER_MSEC 1000000ull
#define USEC_PER_SEC 1000000ull
#define NSEC_PER_USEC 1000ull
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/libdispatch-changes/attachments/20100217/0ba12a4f/attachment-0001.html>
More information about the libdispatch-changes
mailing list