Changeset 608 for trunk/src

Timestamp:

Feb 26, 2010, 5:54:20 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

guil: Fixed broken build after r607: INCL_DOSDEVIOCTL causes ALT and other one unsafe "one common word" macros to be defined, that explains why it is not part of INCL_DOS/INCL_BASE.

Location:

trunk/src

Files:

• corelib/global/qt_os2.h (modified) (1 diff)
• gui/itemviews/qfileiconprovider.cpp (modified) (1 diff)

trunk/src/corelib/global/qt_os2.h

@@ -45 +45 @@
 #define QT_OS2_H
 
-#if defined(__EMX__)
-# define OS2EMX_PLAIN_CHAR
+#if
+#define OS2EMX_PLAIN_CHAR
 #endif
 #define INCL_BASE
-#define INCL_DOSDEVIOCTL
 #define INCL_PM
 #include <os2.h>

trunk/src/gui/itemviews/qfileiconprovider.cpp

@@ -53 +53 @@
 #  include <objbase.h>
 #elif defined(Q_WS_PM)
+
 #  include <qt_os2.h>
 #elif defined(Q_WS_MAC)