Moved __printflike() from PlatformCompat.hh to Base.h

It's now used in Fleece.h
couchbase · May 1, 2021 · 0a7efd6 · 0a7efd6
1 parent ff0ef0a
commit 0a7efd6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/API/fleece/Base.h b/API/fleece/Base.h
@@ -38,6 +38,12 @@
     // Typically this is because the return value is something that must be released/freed.
     #define MUST_USE_RESULT                 __attribute__((warn_unused_result))
 
+    #ifndef __printflike
+        // Declares this function takes a printf-like format string, and the subsequent args should
+        // be type-checked against it.
+        #define __printflike(fmtarg, varg) __attribute__((__format__ (__printf__, fmtarg, varg)))
+    #endif
+
     // These have no effect on behavior, but they hint to the optimizer which branch of an 'if'
     // statement to make faster.
     #define _usuallyTrue(VAL)               __builtin_expect(VAL, true)
@@ -46,6 +52,10 @@
     #define RETURNS_NONNULL
     #define MUST_USE_RESULT
 
+    #ifndef __printflike
+        #define __printflike(fmtarg, varg)
+    #endif
+
     #define _usuallyTrue(VAL)               (VAL)
     #define _usuallyFalse(VAL)              (VAL)
 #endif

diff --git a/Fleece/Support/PlatformCompat.hh b/Fleece/Support/PlatformCompat.hh
@@ -37,8 +37,6 @@
 
     #define MAXFLOAT FLT_MAX
 
-    #define __printflike(A, B)
-
     #define cbl_strdup _strdup
     #define cbl_getcwd _getcwd
 
@@ -73,12 +71,6 @@
         #define ASSUME(cond)                (void(0))
     #endif
 
-    // Declares this function takes a printf-like format string, and the subsequent args should
-    // be type-checked against it.
-    #ifndef __printflike
-    #define __printflike(fmtarg, firstvararg) __attribute__((__format__ (__printf__, fmtarg, firstvararg)))
-    #endif
-
     // Windows has underscore prefixes before these function names, so define a common name
     #define cbl_strdup strdup
     #define cbl_getcwd getcwd