Dmitry Gorbachev

- Change include order to prevent redefinition of _pctype.
See issue #3801 for more details.

svn path=/trunk/; revision=36938
This commit is contained in:
Aleksey Bragin 2008-10-25 11:09:33 +00:00
parent 8d30598bdf
commit f39710c68c

View file

@ -25,20 +25,6 @@
// Martin Fuchs, 23.07.2003
//
#ifdef __cplusplus
#ifdef _MSC_VER
#pragma warning(disable: 4786) // disable warnings about too long debug information symbols
#endif
// STL headers for strings and streams
#include <string>
#include <iostream>
using namespace std;
#endif /* __cplusplus */
// standard windows headers
#define WIN32_LEAN_AND_MEAN
#define WIN32_EXTRA_LEAN
@ -64,6 +50,19 @@ using namespace std;
#include <stdio.h> // for sprintf()
#include <time.h>
#ifdef __cplusplus
#ifdef _MSC_VER
#pragma warning(disable: 4786) // disable warnings about too long debug information symbols
#endif
// STL headers for strings and streams
#include <string>
#include <iostream>
using namespace std;
#endif /* __cplusplus */
#ifndef _MAX_PATH
#define _MAX_DRIVE 3
#define _MAX_FNAME 256