diff options
Diffstat (limited to 'hugin.c')
| -rw-r--r-- | hugin.c | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -46,10 +46,6 @@ # ifdef WIN32 # include <windows.h> typedef HANDLE mutex_t; - -// see http://stackoverflow.com/questions/558223/va-copy-porting-to-visual-c -//#define va_copy(dest, src) (dest = src) - # else # include <pthread.h> typedef pthread_mutex_t mutex_t; @@ -385,9 +381,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; @@ -409,13 +405,13 @@ int __debug(const char *func, const int line, // // Generate message // - va_list va; - va_start(va, fmt); { + va_list va; + va_start(va, fmt); hdr_bufsz = scprintf(hdr_fmt, HDR_ARGS); msg_bufsz = vscprintf(fmt, va); if(hdr_bufsz < 0 || msg_bufsz < 0) return 1; // Bad format? - // va_end(va); + va_end(va); } buf = (char*)malloc(hdr_bufsz + msg_bufsz + 1); @@ -425,8 +421,8 @@ int __debug(const char *func, const int line, if(sz < 0) return 1; // Unknown error { - //va_list va; - //va_start(va, fmt); + va_list va; + va_start(va, fmt); sz = vsprintf(buf + sz, fmt, va); if(sz < 0) return 1; // Unknown error va_end(va); |