diff options
Diffstat (limited to 'hugin.c')
| -rw-r--r-- | hugin.c | 34 |
1 files changed, 14 insertions, 20 deletions
@@ -46,7 +46,7 @@ typedef HANDLE mutex_t; // see http://stackoverflow.com/questions/558223/va-copy-porting-to-visual-c -#define va_copy(dest, src) (dest = src) +//#define va_copy(dest, src) (dest = src) # else # include <pthread.h> @@ -407,22 +407,14 @@ int __debug(const char *func, const int line, // // Generate message // - - // Get number of bytes needed for the buffer: va_list va; va_start(va, fmt); - - // Use a copy of va_list for 64bit fix: - // see http://www.bailopan.net/blog/?p=30 - // - // Not available in windows. So hugin may break in 64bit windows - - va_list vacpy; - va_copy(vacpy, va); - - hdr_bufsz = scprintf(hdr_fmt, HDR_ARGS); - msg_bufsz = vscprintf(fmt, vacpy); - if(hdr_bufsz < 0 || msg_bufsz < 0) return 1; // Bad format? + { + 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); + } buf = (char*)malloc(hdr_bufsz + msg_bufsz + 1); if(!buf) return 1; // Out of memory @@ -430,11 +422,13 @@ int __debug(const char *func, const int line, sz = sprintf(buf, hdr_fmt, HDR_ARGS); if(sz < 0) return 1; // Unknown error - va_copy(vacpy, va); - sz = vsprintf(buf + sz, fmt, vacpy); - if(sz < 0) return 1; // Unknown error - - va_end(va); + { + //va_list va; + //va_start(va, fmt); + sz = vsprintf(buf + sz, fmt, va); + if(sz < 0) return 1; // Unknown error + va_end(va); + } // // Send message to output |