diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
| commit | 23e2767dc3e6b8891d4b55b711c70c6bc85a6f85 (patch) | |
| tree | 04c538697c3afbd401afb1bb614460b16be28844 /mesalib/src/glsl/ralloc.c | |
| parent | 125500b44d0253d7fd7a59905ab730151d4f66e2 (diff) | |
| parent | 02f377d5e2dd18537d0807ad63675a0970b5a37d (diff) | |
| download | vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.gz vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.bz2 vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/include/scrnintstr.h
xorg-server/xkb/ddxList.c
xorg-server/xkb/ddxLoad.c
Diffstat (limited to 'mesalib/src/glsl/ralloc.c')
| -rw-r--r-- | mesalib/src/glsl/ralloc.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/src/glsl/ralloc.c b/mesalib/src/glsl/ralloc.c index f5f3934ac..91e4bab2e 100644 --- a/mesalib/src/glsl/ralloc.c +++ b/mesalib/src/glsl/ralloc.c @@ -33,6 +33,12 @@ #include <limits.h> #endif +/* Some versions of MinGW are missing _vscprintf's declaration, although they + * still provide the symbol in the import library. */ +#ifdef __MINGW32__ +_CRTIMP int _vscprintf(const char *format, va_list argptr); +#endif + #include "ralloc.h" #ifdef __GNUC__ @@ -397,7 +403,7 @@ printf_length(const char *fmt, va_list untouched_args) va_list args; va_copy(args, untouched_args); -#ifdef _MSC_VER +#ifdef _WIN32 /* We need to use _vcsprintf to calculate the size as vsnprintf returns -1 * if the number of characters to write is greater than count. */ |