diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
| commit | 405ae9defaaa03d4d305b6264a744107c3dd460d (patch) | |
| tree | e119a54d876fa737d859718afbde7ef507702631 /mesalib/src/mesa/main/imports.h | |
| parent | 3a5976985ab1ca641b095a72730f1f3d3bd5f9bc (diff) | |
| parent | 336bad93d146931c160d8517edfdf0bee49ad9f7 (diff) | |
| download | vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.gz vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.bz2 vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/src/kinput.c
Diffstat (limited to 'mesalib/src/mesa/main/imports.h')
| -rw-r--r-- | mesalib/src/mesa/main/imports.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index 9fb6ae8f1..c0b6cecea 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -646,16 +646,6 @@ _mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg); #endif -/** - * On Mingw32 we need to use __mingw_fprintf() to parse formats such - * as "0x%llx", and possibly others - */ -#ifdef __MINGW32__ -#define fprintf __mingw_fprintf -#endif - - - #ifdef __cplusplus } #endif |