diff options
| -rw-r--r-- | Alc/logging.h | 4 | ||||
| -rw-r--r-- | common/bool.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Alc/logging.h b/Alc/logging.h index 785771c8..2d9f4063 100644 --- a/Alc/logging.h +++ b/Alc/logging.h @@ -17,7 +17,7 @@ extern "C" { extern FILE *LogFile; #if defined(__GNUC__) && !defined(_WIN32) -#define AL_PRINT(T, MSG, ...) fprintf(LogFile, "AL lib: %s %s: "MSG, T, __FUNCTION__ , ## __VA_ARGS__) +#define AL_PRINT(T, MSG, ...) fprintf(LogFile, "AL lib: %s %s: " MSG, T, __FUNCTION__ , ## __VA_ARGS__) #else void al_print(const char *type, const char *func, const char *fmt, ...) DECL_FORMAT(printf, 3,4); #define AL_PRINT(T, ...) al_print((T), __FUNCTION__, __VA_ARGS__) @@ -25,7 +25,7 @@ void al_print(const char *type, const char *func, const char *fmt, ...) DECL_FOR #ifdef __ANDROID__ #include <android/log.h> -#define LOG_ANDROID(T, MSG, ...) __android_log_print(T, "openal", "AL lib: %s: "MSG, __FUNCTION__ , ## __VA_ARGS__) +#define LOG_ANDROID(T, MSG, ...) __android_log_print(T, "openal", "AL lib: %s: " MSG, __FUNCTION__ , ## __VA_ARGS__) #else #define LOG_ANDROID(T, MSG, ...) ((void)0) #endif diff --git a/common/bool.h b/common/bool.h index 6f714d09..dbb28e15 100644 --- a/common/bool.h +++ b/common/bool.h @@ -5,7 +5,7 @@ #include <stdbool.h> #endif -#ifndef bool +#if !defined(__cplusplus) && !defined(bool) #ifdef HAVE_C99_BOOL #define bool _Bool #else |