diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2014-08-13 18:43:51 +0000 |
|---|---|---|
| committer | Руслан Ижбулатов <lrn1986@gmail.com> | 2014-08-13 23:41:56 +0000 |
| commit | a0faf5a51ced242985e993abc2bc6684863564e0 (patch) | |
| tree | 3b18413c2b3d954e59bc61669eaaddcf721ee4d0 /gtk/gtkprintoperation-win32.c | |
| parent | 1b9fa975af45b1723fe21a65503859609dc0e7ad (diff) | |
| download | gtk+-a0faf5a51ced242985e993abc2bc6684863564e0.tar.gz | |
Fix various warnings
https://bugzilla.gnome.org/show_bug.cgi?id=734737
Diffstat (limited to 'gtk/gtkprintoperation-win32.c')
| -rw-r--r-- | gtk/gtkprintoperation-win32.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c index d537a3490a..64f7714263 100644 --- a/gtk/gtkprintoperation-win32.c +++ b/gtk/gtkprintoperation-win32.c @@ -17,9 +17,13 @@ */ #ifndef _MSC_VER +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0500 +#endif +#ifndef WINVER #define WINVER _WIN32_WINNT #endif +#endif #define COBJMACROS #include "config.h" @@ -680,7 +684,7 @@ devmode_to_settings (GtkPrintSettings *settings, devmode->dmDriverVersion); if (devmode->dmDriverExtra != 0) { - char *extra = g_base64_encode (((char *)devmode) + sizeof (DEVMODEW), + char *extra = g_base64_encode (((const guchar *)devmode) + sizeof (DEVMODEW), devmode->dmDriverExtra); gtk_print_settings_set (settings, GTK_PRINT_SETTINGS_WIN32_DRIVER_EXTRA, @@ -935,10 +939,10 @@ devmode_from_settings (GtkPrintSettings *settings, { HANDLE hDevMode; LPDEVMODEW devmode; - char *extras; + guchar *extras; GtkPaperSize *paper_size; const char *extras_base64; - int extras_len; + gsize extras_len; const char *val; extras = NULL; |