Add PUGL_CONST_API

Just a convenience macro to make declarations a little more readable.

8 files changed, 12 insertions, 12 deletions

diff --git a/.clang-format b/.clang-format
index f0275a9..7b30bd2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -20,6 +20,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
 SpacesInContainerLiterals: false
 StatementMacros:
   - PUGL_API
+  - PUGL_CONST_API
   - PUGL_CONST_FUNC
   - PUGL_DEPRECATED_BY
   - PUGL_UNUSED
diff --git a/doc/c/Doxyfile b/doc/c/Doxyfile
index fe56f0b..bdc3a46 100644
--- a/doc/c/Doxyfile
+++ b/doc/c/Doxyfile
@@ -19,7 +19,7 @@ XML_PROGRAMLISTING     = NO
 SHOW_FILES             = NO
 
 MACRO_EXPANSION        = YES
-PREDEFINED             = PUGL_API PUGL_DISABLE_DEPRECATED PUGL_CONST_FUNC=
+PREDEFINED             = PUGL_API PUGL_DISABLE_DEPRECATED PUGL_CONST_API= PUGL_CONST_FUNC=
 
 INPUT                  = ../../include/pugl/cairo.h \
                          ../../include/pugl/gl.h \
diff --git a/doc/cpp/Doxyfile b/doc/cpp/Doxyfile
index 2bb0f9f..0f5f636 100644
--- a/doc/cpp/Doxyfile
+++ b/doc/cpp/Doxyfile
@@ -24,7 +24,7 @@ XML_PROGRAMLISTING     = NO
 SHOW_FILES             = NO
 
 MACRO_EXPANSION        = YES
-PREDEFINED             = PUGL_API PUGL_DISABLE_DEPRECATED PUGL_CONST_FUNC=
+PREDEFINED             = PUGL_API PUGL_DISABLE_DEPRECATED PUGL_CONST_API= PUGL_CONST_FUNC=
 
 INPUT                  = ../../include/pugl/cairo.h \
                          ../../include/pugl/gl.h \
diff --git a/include/pugl/cairo.h b/include/pugl/cairo.h
index 9909682..48e868e 100644
--- a/include/pugl/cairo.h
+++ b/include/pugl/cairo.h
@@ -33,8 +33,7 @@ PUGL_BEGIN_DECLS
 
    Pass the returned value to puglSetBackend() to draw to a view with Cairo.
 */
-PUGL_API
-PUGL_CONST_FUNC
+PUGL_CONST_API
 const PuglBackend*
 puglCairoBackend(void);
 
diff --git a/include/pugl/gl.h b/include/pugl/gl.h
index 3443d83..51c4a7d 100644
--- a/include/pugl/gl.h
+++ b/include/pugl/gl.h
@@ -94,8 +94,7 @@ puglLeaveContext(PuglView* view);
 
    Pass the returned value to puglSetBackend() to draw to a view with OpenGL.
 */
-PUGL_API
-PUGL_CONST_FUNC
+PUGL_CONST_API
 const PuglBackend*
 puglGlBackend(void);
 
diff --git a/include/pugl/pugl.h b/include/pugl/pugl.h
index 7cb7bc2..41afc25 100644
--- a/include/pugl/pugl.h
+++ b/include/pugl/pugl.h
@@ -47,6 +47,10 @@
 #  define PUGL_CONST_FUNC
 #endif
 
+#define PUGL_CONST_API \
+  PUGL_API             \
+  PUGL_CONST_FUNC
+
 #ifdef __cplusplus
 #  define PUGL_BEGIN_DECLS extern "C" {
 #  define PUGL_END_DECLS }
@@ -585,8 +589,7 @@ typedef enum {
 } PuglStatus;
 
 /// Return a string describing a status code
-PUGL_API
-PUGL_CONST_FUNC
+PUGL_CONST_API
 const char*
 puglStrerror(PuglStatus status);
 
diff --git a/include/pugl/stub.h b/include/pugl/stub.h
index 46e0e96..d1a699a 100644
--- a/include/pugl/stub.h
+++ b/include/pugl/stub.h
@@ -34,8 +34,7 @@ PUGL_BEGIN_DECLS
    This backend just creates a simple native window without setting up any
    portable graphics API.
 */
-PUGL_API
-PUGL_CONST_FUNC
+PUGL_CONST_API
 const PuglBackend*
 puglStubBackend(void);
 
diff --git a/include/pugl/vulkan.h b/include/pugl/vulkan.h
index 8941510..f12ad97 100644
--- a/include/pugl/vulkan.h
+++ b/include/pugl/vulkan.h
@@ -143,8 +143,7 @@ puglCreateSurface(PFN_vkGetInstanceProcAddr    vkGetInstanceProcAddr,
 
    Pass the returned value to puglSetBackend() to draw to a view with Vulkan.
 */
-PUGL_API
-PUGL_CONST_FUNC
+PUGL_CONST_API
 const PuglBackend*
 puglVulkanBackend(void);