Changeset 184944 in webkit

Timestamp:

May 27, 2015, 11:12:46 PM (10 years ago)

Author:

ap@apple.com

Message:

[Mac] Fix clang static analyzer build
​https://bugs.webkit.org/show_bug.cgi?id=145426
rdar://problem/20947408

Reviewed by Dan Bernstein.

• wtf/spi/darwin/XPCSPI.h: Correct declarations of xpc_retain and xpc_release.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/spi/darwin/XPCSPI.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2015-05-27  Alexey Proskuryakov  <ap@apple.com>
+
+        [Mac] Fix clang static analyzer build
+        https://bugs.webkit.org/show_bug.cgi?id=145426
+        rdar://problem/20947408
+
+        Reviewed by Dan Bernstein.
+
+        * wtf/spi/darwin/XPCSPI.h: Correct declarations of xpc_retain and xpc_release.
+
 2015-05-27  Dean Jackson  <dino@apple.com>
 

trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h

@@ -130 +130 @@
 EXTERN_C xpc_type_t xpc_get_type(xpc_object_t);
 EXTERN_C void xpc_main(xpc_connection_handler_t);
-EXTERN_C xpc_object_t xpc_retain(xpc_object_t);
-EXTERN_C void xpc_release(xpc_object_t);
 EXTERN_C const char* xpc_string_get_string_ptr(xpc_object_t);
 EXTERN_C void xpc_transaction_begin(void);
@@ -148 +146 @@
 #endif
 
-#if !defined(xpc_retain) && OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#if !defined(xpc_retain)
 #define xpc_retain(object) ({ xpc_object_t _o = (object); _xpc_object_validate(_o); [_o retain]; })
 #endif
+#else
+EXTERN_C xpc_object_t xpc_retain(xpc_object_t);
+#endif
 
-#if !defined(xpc_release) && OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#if OS_OBJECT_USE_OBJC_RETAIN_RELEASE
+#if !defined(xpc_retain)
 #define xpc_release(object) ({ xpc_object_t _o = (object); _xpc_object_validate(_o); [_o release]; })
+#endif
+#else
+EXTERN_C void xpc_release(xpc_object_t);
 #endif