diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/winmain.cpp | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/winmain.cpp')
| -rw-r--r-- | src/winmain.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/winmain.cpp b/src/winmain.cpp index 752ab8e6b..5120e44e0 100644 --- a/src/winmain.cpp +++ b/src/winmain.cpp @@ -11,7 +11,12 @@ #include <stdio.h> #include <io.h> #include <conio.h> -#define _WIN32_WINNT 0x0501 + +#if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0501) +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 +#endif + #include <windows.h> extern int main (int argc, char **argv); @@ -25,10 +30,10 @@ extern int main (int argc, char **argv); #endif int _stdcall -WinMain (struct HINSTANCE__ *hInstance, - struct HINSTANCE__ *hPrevInstance, - char *lpszCmdLine, - int nCmdShow) +WinMain (struct HINSTANCE__ */*hInstance*/, + struct HINSTANCE__ */*hPrevInstance*/, + char */*lpszCmdLine*/, + int /*nCmdShow*/) { if (fileno (stdout) != -1 && _get_osfhandle (fileno (stdout)) != -1) |