Title: [184944] trunk/Source/WTF
Revision
184944
Author
[email protected]
Date
2015-05-27 23:12:46 -0700 (Wed, 27 May 2015)

Log 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.

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (184943 => 184944)


--- trunk/Source/WTF/ChangeLog	2015-05-28 05:52:59 UTC (rev 184943)
+++ trunk/Source/WTF/ChangeLog	2015-05-28 06:12:46 UTC (rev 184944)
@@ -1,3 +1,13 @@
+2015-05-27  Alexey Proskuryakov  <[email protected]>
+
+        [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  <[email protected]>
 
         img.currentSrc problem in strict mode with old picturefill

Modified: trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h (184943 => 184944)


--- trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2015-05-28 05:52:59 UTC (rev 184943)
+++ trunk/Source/WTF/wtf/spi/darwin/XPCSPI.h	2015-05-28 06:12:46 UTC (rev 184944)
@@ -129,8 +129,6 @@
 EXTERN_C void xpc_dictionary_set_value(xpc_object_t, const char*key, xpc_object_t value);
 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);
 EXTERN_C void xpc_track_activity(void);
@@ -147,12 +145,20 @@
 EXTERN_C xpc_object_t xpc_copy_bootstrap(void);
 #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
 
 #endif // XPCSPI_h
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to