sokol_audio/fetch/spine.h: better naming for log item xmacros

sokol_audio.h

@@ -509,48 +509,48 @@ extern "C" {
     Used as parameter in the logging callback.
 */
 #define _SAUDIO_LOG_ITEMS \
-    _SAUDIO_XMACRO(OK) \
-    _SAUDIO_XMACRO(MALLOC_FAILED) \
-    _SAUDIO_XMACRO(ALSA_SND_PCM_OPEN_FAILED) \
-    _SAUDIO_XMACRO(ALSA_FLOAT_SAMPLES_NOT_SUPPORTED) \
-    _SAUDIO_XMACRO(ALSA_REQUESTED_BUFFER_SIZE_NOT_SUPPORTED) \
-    _SAUDIO_XMACRO(ALSA_REQUESTED_CHANNEL_COUNT_NOT_SUPPORTED) \
-    _SAUDIO_XMACRO(ALSA_SND_PCM_HW_PARAMS_SET_RATE_NEAR_FAILED) \
-    _SAUDIO_XMACRO(ALSA_SND_PCM_HW_PARAMS_FAILED) \
-    _SAUDIO_XMACRO(ALSA_PTHREAD_CREATE_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_CREATE_EVENT_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_CREATE_DEVICE_ENUMERATOR_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_GET_DEFAULT_AUDIO_ENDPOINT_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_DEVICE_ACTIVATE_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_AUDIO_CLIENT_INITIALIZE_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_AUDIO_CLIENT_GET_BUFFER_SIZE_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_AUDIO_CLIENT_GET_SERVICE_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_AUDIO_CLIENT_SET_EVENT_HANDLE_FAILED) \
-    _SAUDIO_XMACRO(WASAPI_CREATE_THREAD_FAILED) \
-    _SAUDIO_XMACRO(AAUDIO_STREAMBUILDER_OPEN_STREAM_FAILED) \
-    _SAUDIO_XMACRO(AAUDIO_PTHREAD_CREATE_FAILED) \
-    _SAUDIO_XMACRO(AAUDIO_RESTARTING_STREAM_AFTER_ERROR) \
-    _SAUDIO_XMACRO(USING_AAUDIO_BACKEND) \
-    _SAUDIO_XMACRO(AAUDIO_CREATE_STREAMBUILDER_FAILED) \
-    _SAUDIO_XMACRO(USING_SLES_BACKEND) \
-    _SAUDIO_XMACRO(SLES_CREATE_ENGINE_FAILED) \
-    _SAUDIO_XMACRO(SLES_ENGINE_GET_ENGINE_INTERFACE_FAILED) \
-    _SAUDIO_XMACRO(SLES_CREATE_OUTPUT_MIX_FAILED) \
-    _SAUDIO_XMACRO(SLES_MIXER_GET_VOLUME_INTERFACE_FAILED) \
-    _SAUDIO_XMACRO(SLES_ENGINE_CREATE_AUDIO_PLAYER_FAILED) \
-    _SAUDIO_XMACRO(SLES_PLAYER_GET_PLAY_INTERFACE_FAILED) \
-    _SAUDIO_XMACRO(SLES_PLAYER_GET_VOLUME_INTERFACE_FAILED) \
-    _SAUDIO_XMACRO(SLES_PLAYER_GET_BUFFERQUEUE_INTERFACE_FAILED) \
-    _SAUDIO_XMACRO(COREAUDIO_NEW_OUTPUT_FAILED) \
-    _SAUDIO_XMACRO(COREAUDIO_ALLOCATE_BUFFER_FAILED) \
-    _SAUDIO_XMACRO(COREAUDIO_START_FAILED) \
-    _SAUDIO_XMACRO(BACKEND_BUFFER_SIZE_ISNT_MULTIPLE_OF_PACKET_SIZE) \
-
-#define _SAUDIO_XMACRO(item) SAUDIO_LOGITEM_##item,
+    _SAUDIO_LOGITEM_XMACRO(OK) \
+    _SAUDIO_LOGITEM_XMACRO(MALLOC_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_SND_PCM_OPEN_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_FLOAT_SAMPLES_NOT_SUPPORTED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_REQUESTED_BUFFER_SIZE_NOT_SUPPORTED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_REQUESTED_CHANNEL_COUNT_NOT_SUPPORTED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_SND_PCM_HW_PARAMS_SET_RATE_NEAR_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_SND_PCM_HW_PARAMS_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(ALSA_PTHREAD_CREATE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_CREATE_EVENT_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_CREATE_DEVICE_ENUMERATOR_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_GET_DEFAULT_AUDIO_ENDPOINT_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_DEVICE_ACTIVATE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_AUDIO_CLIENT_INITIALIZE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_AUDIO_CLIENT_GET_BUFFER_SIZE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_AUDIO_CLIENT_GET_SERVICE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_AUDIO_CLIENT_SET_EVENT_HANDLE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(WASAPI_CREATE_THREAD_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(AAUDIO_STREAMBUILDER_OPEN_STREAM_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(AAUDIO_PTHREAD_CREATE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(AAUDIO_RESTARTING_STREAM_AFTER_ERROR) \
+    _SAUDIO_LOGITEM_XMACRO(USING_AAUDIO_BACKEND) \
+    _SAUDIO_LOGITEM_XMACRO(AAUDIO_CREATE_STREAMBUILDER_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(USING_SLES_BACKEND) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_CREATE_ENGINE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_ENGINE_GET_ENGINE_INTERFACE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_CREATE_OUTPUT_MIX_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_MIXER_GET_VOLUME_INTERFACE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_ENGINE_CREATE_AUDIO_PLAYER_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_PLAYER_GET_PLAY_INTERFACE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_PLAYER_GET_VOLUME_INTERFACE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(SLES_PLAYER_GET_BUFFERQUEUE_INTERFACE_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(COREAUDIO_NEW_OUTPUT_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(COREAUDIO_ALLOCATE_BUFFER_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(COREAUDIO_START_FAILED) \
+    _SAUDIO_LOGITEM_XMACRO(BACKEND_BUFFER_SIZE_ISNT_MULTIPLE_OF_PACKET_SIZE) \
+
+#define _SAUDIO_LOGITEM_XMACRO(item) SAUDIO_LOGITEM_##item,
 typedef enum saudio_log_item {
     _SAUDIO_LOG_ITEMS
 } saudio_log_item;
-#undef _SAUDIO_XMACRO
+#undef _SAUDIO_LOGITEM_XMACRO
 
 /*
     saudio_logger
@@ -1102,11 +1102,11 @@ _SOKOL_PRIVATE void _saudio_stream_callback(float* buffer, int num_frames, int n
 //
 // >>logging
 #if defined(SOKOL_DEBUG)
-#define _SAUDIO_XMACRO(item) #item,
+#define _SAUDIO_LOGITEM_XMACRO(item) #item,
 static const char* _saudio_log_messages[] = {
     _SAUDIO_LOG_ITEMS
 };
-#undef _SAUDIO_XMACRO
+#undef _SAUDIO_LOGITEM_XMACRO
 #endif // SOKOL_DEBUG
 
 #define _SAUDIO_PANIC(code) _saudio_log(SAUDIO_LOGITEM_ ##code, 0, __LINE__)

sokol_fetch.h

@@ -953,26 +953,26 @@ extern "C" {
     Used as parameter in the logging callback.
 */
 #define _SFETCH_LOG_ITEMS \
-    _SFETCH_XMACRO(OK) \
-    _SFETCH_XMACRO(MALLOC_FAILED) \
-    _SFETCH_XMACRO(FILE_PATH_UTF8_DECODING_FAILED) \
-    _SFETCH_XMACRO(SEND_QUEUE_FULL) \
-    _SFETCH_XMACRO(REQUEST_CHANNEL_TOO_BIG) \
-    _SFETCH_XMACRO(REQUEST_PATH_IS_NULL) \
-    _SFETCH_XMACRO(REQUEST_PATH_TOO_LONG) \
-    _SFETCH_XMACRO(REQUEST_CALLBACK_MISSING) \
-    _SFETCH_XMACRO(REQUEST_CHUNK_SIZE_GREATER_BUFFER_SIZE) \
-    _SFETCH_XMACRO(REQUEST_USERDATA_PTR_IS_SET_BUT_USERDATA_SIZE_IS_NULL) \
-    _SFETCH_XMACRO(REQUEST_USERDATA_PTR_IS_NULL_BUT_USERDATA_SIZE_IS_NOT) \
-    _SFETCH_XMACRO(REQUEST_USERDATA_SIZE_TOO_BIG) \
-    _SFETCH_XMACRO(CLAMPING_NUM_CHANNELS_TO_MAX_CHANNELS) \
-    _SFETCH_XMACRO(REQUEST_POOL_FULL) \
-
-#define _SFETCH_XMACRO(item) SFETCH_LOGITEM_##item,
+    _SFETCH_LOGITEM_XMACRO(OK) \
+    _SFETCH_LOGITEM_XMACRO(MALLOC_FAILED) \
+    _SFETCH_LOGITEM_XMACRO(FILE_PATH_UTF8_DECODING_FAILED) \
+    _SFETCH_LOGITEM_XMACRO(SEND_QUEUE_FULL) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_CHANNEL_TOO_BIG) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_PATH_IS_NULL) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_PATH_TOO_LONG) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_CALLBACK_MISSING) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_CHUNK_SIZE_GREATER_BUFFER_SIZE) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_USERDATA_PTR_IS_SET_BUT_USERDATA_SIZE_IS_NULL) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_USERDATA_PTR_IS_NULL_BUT_USERDATA_SIZE_IS_NOT) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_USERDATA_SIZE_TOO_BIG) \
+    _SFETCH_LOGITEM_XMACRO(CLAMPING_NUM_CHANNELS_TO_MAX_CHANNELS) \
+    _SFETCH_LOGITEM_XMACRO(REQUEST_POOL_FULL) \
+
+#define _SFETCH_LOGITEM_XMACRO(item) SFETCH_LOGITEM_##item,
 typedef enum sfetch_log_item_t {
     _SFETCH_LOG_ITEMS
 } sfetch_log_item_t;
-#undef _SFETCH_XMACRO
+#undef _SFETCH_LOGITEM_XMACRO
 
 /*
     sfetch_logger_t
@@ -1380,11 +1380,11 @@ static _sfetch_t* _sfetch;
 //
 // >>logging
 #if defined(SOKOL_DEBUG)
-#define _SFETCH_XMACRO(item) #item,
+#define _SFETCH_LOGITEM_XMACRO(item) #item,
 static const char* _sfetch_log_messages[] = {
     _SFETCH_LOG_ITEMS
 };
-#undef _SFETCH_XMACRO
+#undef _SFETCH_LOGITEM_XMACRO
 #endif // SOKOL_DEBUG
 
 #define _SFETCH_PANIC(code) _sfetch_log(SFETCH_LOGITEM_ ##code, 0, __LINE__)

util/sokol_spine.h

@@ -1011,40 +1011,40 @@ typedef enum sspine_resource_state {
 
 // log item codes via x-macro magic
 #define _SSPINE_LOG_ITEMS \
-    _SSPINE_XMACRO(OK)\
-    _SSPINE_XMACRO(CONTEXT_POOL_EXHAUSTED)\
-    _SSPINE_XMACRO(ATLAS_POOL_EXHAUSTED)\
-    _SSPINE_XMACRO(SKELETON_POOL_EXHAUSTED)\
-    _SSPINE_XMACRO(SKINSET_POOL_EXHAUSTED)\
-    _SSPINE_XMACRO(INSTANCE_POOL_EXHAUSTED)\
-    _SSPINE_XMACRO(CANNOT_DESTROY_DEFAULT_CONTEXT)\
-    _SSPINE_XMACRO(ATLAS_DESC_NO_DATA)\
-    _SSPINE_XMACRO(SPINE_ATLAS_CREATION_FAILED)\
-    _SSPINE_XMACRO(SG_ALLOC_IMAGE_FAILED)\
-    _SSPINE_XMACRO(SKELETON_DESC_NO_DATA)\
-    _SSPINE_XMACRO(SKELETON_DESC_NO_ATLAS)\
-    _SSPINE_XMACRO(SKELETON_ATLAS_NOT_VALID)\
-    _SSPINE_XMACRO(SPINE_SKELETON_DATA_CREATION_FAILED)\
-    _SSPINE_XMACRO(SKINSET_DESC_NO_SKELETON)\
-    _SSPINE_XMACRO(SKINSET_SKELETON_NOT_VALID)\
-    _SSPINE_XMACRO(SKINSET_INVALID_SKIN_HANDLE)\
-    _SSPINE_XMACRO(INSTANCE_DESC_NO_SKELETON)\
-    _SSPINE_XMACRO(INSTANCE_SKELETON_NOT_VALID)\
-    _SSPINE_XMACRO(INSTANCE_ATLAS_NOT_VALID)\
-    _SSPINE_XMACRO(SPINE_SKELETON_CREATION_FAILED)\
-    _SSPINE_XMACRO(SPINE_ANIMATIONSTATE_CREATION_FAILED)\
-    _SSPINE_XMACRO(SPINE_SKELETONCLIPPING_CREATION_FAILED)\
-    _SSPINE_XMACRO(COMMAND_BUFFER_OVERFLOW)\
-    _SSPINE_XMACRO(VERTEX_BUFFER_OVERFLOW)\
-    _SSPINE_XMACRO(INDEX_BUFFER_OVERFLOW)\
-    _SSPINE_XMACRO(STRING_TRUNCATED)\
-    _SSPINE_XMACRO(SG_ADD_COMMIT_LISTENER_FAILED)\
-
-#define _SSPINE_XMACRO(code) SSPINE_LOGITEM_##code,
+    _SSPINE_LOGITEM_XMACRO(OK)\
+    _SSPINE_LOGITEM_XMACRO(CONTEXT_POOL_EXHAUSTED)\
+    _SSPINE_LOGITEM_XMACRO(ATLAS_POOL_EXHAUSTED)\
+    _SSPINE_LOGITEM_XMACRO(SKELETON_POOL_EXHAUSTED)\
+    _SSPINE_LOGITEM_XMACRO(SKINSET_POOL_EXHAUSTED)\
+    _SSPINE_LOGITEM_XMACRO(INSTANCE_POOL_EXHAUSTED)\
+    _SSPINE_LOGITEM_XMACRO(CANNOT_DESTROY_DEFAULT_CONTEXT)\
+    _SSPINE_LOGITEM_XMACRO(ATLAS_DESC_NO_DATA)\
+    _SSPINE_LOGITEM_XMACRO(SPINE_ATLAS_CREATION_FAILED)\
+    _SSPINE_LOGITEM_XMACRO(SG_ALLOC_IMAGE_FAILED)\
+    _SSPINE_LOGITEM_XMACRO(SKELETON_DESC_NO_DATA)\
+    _SSPINE_LOGITEM_XMACRO(SKELETON_DESC_NO_ATLAS)\
+    _SSPINE_LOGITEM_XMACRO(SKELETON_ATLAS_NOT_VALID)\
+    _SSPINE_LOGITEM_XMACRO(SPINE_SKELETON_DATA_CREATION_FAILED)\
+    _SSPINE_LOGITEM_XMACRO(SKINSET_DESC_NO_SKELETON)\
+    _SSPINE_LOGITEM_XMACRO(SKINSET_SKELETON_NOT_VALID)\
+    _SSPINE_LOGITEM_XMACRO(SKINSET_INVALID_SKIN_HANDLE)\
+    _SSPINE_LOGITEM_XMACRO(INSTANCE_DESC_NO_SKELETON)\
+    _SSPINE_LOGITEM_XMACRO(INSTANCE_SKELETON_NOT_VALID)\
+    _SSPINE_LOGITEM_XMACRO(INSTANCE_ATLAS_NOT_VALID)\
+    _SSPINE_LOGITEM_XMACRO(SPINE_SKELETON_CREATION_FAILED)\
+    _SSPINE_LOGITEM_XMACRO(SPINE_ANIMATIONSTATE_CREATION_FAILED)\
+    _SSPINE_LOGITEM_XMACRO(SPINE_SKELETONCLIPPING_CREATION_FAILED)\
+    _SSPINE_LOGITEM_XMACRO(COMMAND_BUFFER_OVERFLOW)\
+    _SSPINE_LOGITEM_XMACRO(VERTEX_BUFFER_OVERFLOW)\
+    _SSPINE_LOGITEM_XMACRO(INDEX_BUFFER_OVERFLOW)\
+    _SSPINE_LOGITEM_XMACRO(STRING_TRUNCATED)\
+    _SSPINE_LOGITEM_XMACRO(SG_ADD_COMMIT_LISTENER_FAILED)\
+
+#define _SSPINE_LOGITEM_XMACRO(code) SSPINE_LOGITEM_##code,
 typedef enum sspine_log_item {
     _SSPINE_LOG_ITEMS
 } sspine_log_item;
-#undef _SSPINE_XMACRO
+#undef _SSPINE_LOGITEM_XMACRO
 
 typedef struct sspine_layer_transform {
     sspine_vec2 size;
@@ -2800,11 +2800,11 @@ char* _spUtil_readFile(const char* path, int* length) {
 //
 // >>logging
 #if defined(SOKOL_DEBUG)
-#define _SSPINE_XMACRO(code) #code,
+#define _SSPINE_LOGITEM_XMACRO(code) #code,
 static const char* _sspine_log_messages[] = {
     _SSPINE_LOG_ITEMS
 };
-#undef _SSPINE_XMACRO
+#undef _SSPINE_LOGITEM_XMACRO
 #endif // SOKOL_DEBUG
 
 #define _SSPINE_PANIC(code) _sspine_log(SSPINE_LOGITEM_ ##code, 0, __LINE__)