diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /mesalib/src/mesa/main/imports.h | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'mesalib/src/mesa/main/imports.h')
| -rw-r--r-- | mesalib/src/mesa/main/imports.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index ce7b45d77..aa5eb3200 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -38,7 +38,7 @@ #include "compiler.h" #include "glheader.h" - +#include "errors.h" #ifdef __cplusplus extern "C" { @@ -622,19 +622,8 @@ _mesa_str_checksum(const char *str); extern int _mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4); -struct gl_context; - -extern void -_mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3); - -extern void -_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3); - -extern void -_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4); - -extern void -_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3); +extern int +_mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg); #if defined(_MSC_VER) && !defined(snprintf) |