Changeset 608 for trunk/src


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/corelib/global/qt_os2.h

    r607 r608  
    4545#define QT_OS2_H
    4646
    47 #if defined(__EMX__)
    48 # define OS2EMX_PLAIN_CHAR
     47#ifdef __EMX__
     48#define OS2EMX_PLAIN_CHAR
    4949#endif
    5050#define INCL_BASE
    51 #define INCL_DOSDEVIOCTL
    5251#define INCL_PM
    5352#include <os2.h>

  • trunk/src/gui/itemviews/qfileiconprovider.cpp

    r607 r608  
    5353#  include <objbase.h>
    5454#elif defined(Q_WS_PM)
     55#  define INCL_DOSDEVIOCTL
    5556#  include <qt_os2.h>
    5657#elif defined(Q_WS_MAC)
Note: See TracChangeset for help on using the changeset viewer.