Author: fireball
Date: Sat Oct 25 06:09:33 2008
New Revision: 36938
URL:
http://svn.reactos.org/svn/reactos?rev=36938&view=rev
Log:
Dmitry Gorbachev
- Change include order to prevent redefinition of _pctype.
See issue #3801 for more details.
Modified:
trunk/reactos/base/shell/explorer/utility/utility.h
Modified: trunk/reactos/base/shell/explorer/utility/utility.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit…
==============================================================================
--- trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/utility/utility.h [iso-8859-1] Sat Oct 25 06:09:33
2008
@@ -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
@@ -63,6 +49,19 @@
#include <stdlib.h> // for _MAX_DIR, ...
#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