Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'fix_compilation' into 'master'
[libiodata] Fix compilation with gcc 4.9. Contributes to JB#44872

See merge request mer-core/libiodata!2
  • Loading branch information
pvuorela committed Feb 21, 2019
2 parents 120748c + f576075 commit 3d29033
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/log.h
Expand Up @@ -42,8 +42,8 @@
# define log_debug(FMT,ARGS...) \
do { \
printf("DEBUG: %s:%d: %s", __FILE__, __LINE__, Q_FUNC_INFO); \
if (strlen(""FMT) > 0) \
printf(":\n- "FMT"\n", ## ARGS); \
if (strlen("" FMT) > 0) \
printf(":\n- " FMT "\n", ## ARGS); \
else \
printf("\n"); \
} while(0)
Expand All @@ -52,31 +52,31 @@
#endif

#if LOG_LEVEL >= LOG_INFO
# define log_info(FMT,ARGS...) do { fprintf(stderr, "INFO: "FMT"\n", ## ARGS); } while(0)
# define log_info(FMT,ARGS...) do { fprintf(stderr, "INFO: " FMT "\n", ## ARGS); } while(0)
#else
# define log_info(FMT,ARGS...) do { } while(0)
#endif

#if LOG_LEVEL >= LOG_INFO
# define log_notice(FMT,ARGS...) do { fprintf(stderr, "NOTICE: "FMT"\n", ## ARGS); } while(0)
# define log_notice(FMT,ARGS...) do { fprintf(stderr, "NOTICE: " FMT "\n", ## ARGS); } while(0)
#else
# define log_notice(FMT,ARGS...) do { } while(0)
#endif

#if LOG_LEVEL >= LOG_WARNING
# define log_warning(FMT,ARGS...) do { fprintf(stderr, "WARNING: "FMT"\n", ## ARGS); } while(0)
# define log_warning(FMT,ARGS...) do { fprintf(stderr, "WARNING: " FMT "\n", ## ARGS); } while(0)
#else
# define log_warning(FMT,ARGS...) do { } while(0)
#endif

#if LOG_LEVEL >= LOG_ERROR
# define log_error(FMT,ARGS...) do { fprintf(stderr, "ERROR: "FMT"\n", ## ARGS); } while(0)
# define log_error(FMT,ARGS...) do { fprintf(stderr, "ERROR: " FMT "\n", ## ARGS); } while(0)
#else
# define log_error(FMT,ARGS...) do { } while(0)
#endif

#if LOG_LEVEL >= LOG_CRITICAL
# define log_critical(FMT,ARGS...) do { fprintf(stderr, "CRITICAL: "FMT"\n", ## ARGS); } while(0)
# define log_critical(FMT,ARGS...) do { fprintf(stderr, "CRITICAL: " FMT "\n", ## ARGS); } while(0)
#else
# define log_critical(FMT,ARGS...) do { } while(0)
#endif
Expand All @@ -85,10 +85,10 @@
# define log_assert(COND, ARGS...) \
do { \
if (!(COND)) \
fprintf(stderr, "ASSERT: "ARGS); \
fprintf(stderr, "ASSERT: " ARGS); \
assert(COND); \
} while(0)
# define log_abort(FMT,ARGS...) do { fprintf(stderr, "ABORT: "FMT"\n", ## ARGS); assert(0); } while(0)
# define log_abort(FMT,ARGS...) do { fprintf(stderr, "ABORT: " FMT "\n", ## ARGS); assert(0); } while(0)
#else
# define log_assert(COND, ARGS...) do { assert(COND); } while(0)
# define log_abort(FMT,ARGS...) do { assert(0); } while(0)
Expand Down

0 comments on commit 3d29033

Please sign in to comment.