summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-05-28 14:32:40 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2014-05-28 14:32:40 +0200
commit9ade9fd834a59e505c4856a206851c8256d08abe (patch)
tree7fd44496ab130cc42353beee792b19b9cf918958
parent71f375f27e7a59115c0ddace258052f3147dd023 (diff)
Fix nameclash with gcc __debug symbol.20140528
-rw-r--r--hugin.c6
-rw-r--r--hugin.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/hugin.c b/hugin.c
index c677ecd..5b4591b 100644
--- a/hugin.c
+++ b/hugin.c
@@ -379,9 +379,9 @@ static int scprintf(const char *fmt, ...)
#define HDR_ARGS debug_class_str[(unsigned)cl], ch, func, line
-int __debug(const char *func, const int line,
- const enum __debug_class cl,
- const char *ch, const char *fmt, ...)
+int __hugin__debug(const char *func, const int line,
+ const enum __debug_class cl,
+ const char *ch, const char *fmt, ...)
{
int result = 0;
int sz;
diff --git a/hugin.h b/hugin.h
index 768cdcf..ee1152b 100644
--- a/hugin.h
+++ b/hugin.h
@@ -179,12 +179,12 @@ enum __debug_class
__class_debug = 4
};
-int __debug(const char *func, const int line, enum __debug_class cl,
- const char *ch, const char *fmt, ...)
+int __hugin__debug(const char *func, const int line, enum __debug_class cl,
+ const char *ch, const char *fmt, ...)
__attribute__((format (printf,5,6)));
#define __DEBUG_PRINT(cl, ch, fmt...) \
- do { __debug(__func__, __LINE__, cl, ch, fmt); } while(0)
+ do { __hugin__debug(__func__, __LINE__, cl, ch, fmt); } while(0)
#define __DEBUG(cl, ch, fmt...) \
__DEBUG_PRINT(__class##cl, #ch, fmt)