Changeset 128034 in webkit
- Timestamp:
- Sep 10, 2012 2:16:05 AM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r128030 r128034 1 2012-09-10 Simon Hausmann <simon.hausmann@nokia.com> 2 3 Fix build of WTR with Qt on Windows 4 https://bugs.webkit.org/show_bug.cgi?id=96249 5 6 Reviewed by Kenneth Rohde Christiansen. 7 8 Windows loves to define min and max as macros, which beautifully 9 clashes in many places where min and max are used as variable or method 10 names. It can be convinced not to do this when min and max are already 11 define as macros (expanding to themselves). We have this kind of 12 workaround in config.h files all over WebKit and as it turns out when 13 building WTR with Qt on Windows we do end up with such a clash. Therefore 14 we need the same workaround. 15 16 * WebKitTestRunner/config.h: 17 1 18 2012-09-10 Christophe Dumez <christophe.dumez@intel.com> 2 19 -
trunk/Tools/WebKitTestRunner/config.h
r124163 r128034 49 49 #endif 50 50 51 #if OS(WINDOWS) 52 /* If we don't define these, they get defined in windef.h. */ 53 /* We want to use std::min and std::max. */ 54 #ifndef max 55 #define max max 51 56 #endif 57 #ifndef min 58 #define min min 59 #endif 60 #endif 61 62 #endif
Note: See TracChangeset
for help on using the changeset viewer.