Enable building PDCLib with Watcom. This was surprisingly painless: their C99 mode...

[pdclib] / platform / win32 / internals / _PDCLIB_config.h

diff --git a/platform/win32/internals/_PDCLIB_config.h b/platform/win32/internals/_PDCLIB_config.h
index 793065d6c6ec2656c155ca7f99667a62c485b69d..17c8ff4a74a1e7ff1d9f4c1ad21c924bcaa3f109 100644 (file)
--- a/platform/win32/internals/_PDCLIB_config.h
+++ b/platform/win32/internals/_PDCLIB_config.h
@@ -273,13 +273,22 @@ struct _PDCLIB_imaxdiv_t
 */
 
 #ifdef __GNUC__
+  typedef __builtin_va_list _PDCLIB_va_list;
+  #define _PDCLIB_va_arg( ap, type ) (__builtin_va_arg( (ap), type ))
+  #define _PDCLIB_va_copy( dest, src ) (__builtin_va_copy( (dest), (src) ))
+  #define _PDCLIB_va_end( ap ) (__builtin_va_end( ap ) )
+  #define _PDCLIB_va_start( ap, parmN ) (__builtin_va_start( (ap), (parmN) ))
+#elif (defined(__i386__) || defined(__i386) || defined(_M_IX86)) && !(defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64))
+  /* Internal helper macro. va_round is not part of <stdarg.h>. */
+  #define _PDCLIB_va_round( type ) ( (sizeof(type) + sizeof(void *) - 1) & ~(sizeof(void *) - 1) )
+
   typedef char * _PDCLIB_va_list;
-  #define _PDCLIB_va_arg( ap, type ) __builtin_va_arg( ap, type )
-  #define _PDCLIB_va_copy( dest, src ) __builtin_va_copy( dest, src)
-  #define _PDCLIB_va_end( ap ) __builtin_va_end( ap ) 
-  #define _PDCLIB_va_start( ap, parmN ) __builtin_va_start( ap, parmN )
+  #define _PDCLIB_va_arg( ap, type ) ( (ap) += (_PDCLIB_va_round(type)), ( *(type*) ( (ap) - (_PDCLIB_va_round(type)) ) ) )
+  #define _PDCLIB_va_copy( dest, src ) ( (dest) = (src), (void)0 )
+  #define _PDCLIB_va_end( ap ) ( (ap) = (void *)0, (void)0 )
+  #define _PDCLIB_va_start( ap, parmN ) ( (ap) = (char *) &parmN + ( _PDCLIB_va_round(parmN) ), (void)0 )
 #else
-  #error Compiler support please
+  #error Compiler/Architecture support please
 #endif
 
 /* -------------------------------------------------------------------------- */
@@ -336,6 +345,8 @@ typedef void * _PDCLIB_fd_t;
 /* The values of SEEK_SET, SEEK_CUR and SEEK_END, used by fseek().
    Since at least one platform (POSIX) uses the same symbols for its own "seek"
    function, we use whatever the host defines (if it does define them).
+
+   Win32 note: Must match Win32 API values (FILE_BEGIN/FILE_CURRENT/FILE_END)
 */
 #define _PDCLIB_SEEK_SET 0
 #define _PDCLIB_SEEK_CUR 1