Title: [123371] trunk/Source/WebKit/win
- Revision
- 123371
- Author
- [email protected]
- Date
- 2012-07-23 13:23:47 -0700 (Mon, 23 Jul 2012)
Log Message
Build fix if NOMINMAX is defined by the build system.
* COMEnumVariant.h: Added #ifndef NOMINMAX around #define NOMINMAX.
* COMPropertyBag.h: Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/COMEnumVariant.h (123370 => 123371)
--- trunk/Source/WebKit/win/COMEnumVariant.h 2012-07-23 20:22:29 UTC (rev 123370)
+++ trunk/Source/WebKit/win/COMEnumVariant.h 2012-07-23 20:23:47 UTC (rev 123371)
@@ -26,7 +26,9 @@
#ifndef COMEnumVariant_h
#define COMEnumVariant_h
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#include <unknwn.h>
Modified: trunk/Source/WebKit/win/COMPropertyBag.h (123370 => 123371)
--- trunk/Source/WebKit/win/COMPropertyBag.h 2012-07-23 20:22:29 UTC (rev 123370)
+++ trunk/Source/WebKit/win/COMPropertyBag.h 2012-07-23 20:23:47 UTC (rev 123371)
@@ -26,7 +26,9 @@
#ifndef COMPropertyBag_h
#define COMPropertyBag_h
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#include <ocidl.h>
#include <unknwn.h>
Modified: trunk/Source/WebKit/win/ChangeLog (123370 => 123371)
--- trunk/Source/WebKit/win/ChangeLog 2012-07-23 20:22:29 UTC (rev 123370)
+++ trunk/Source/WebKit/win/ChangeLog 2012-07-23 20:23:47 UTC (rev 123371)
@@ -1,3 +1,10 @@
+2012-07-23 Patrick Gansterer <[email protected]>
+
+ Build fix if NOMINMAX is defined by the build system.
+
+ * COMEnumVariant.h: Added #ifndef NOMINMAX around #define NOMINMAX.
+ * COMPropertyBag.h: Ditto.
+
2012-07-23 Pierre Rossi <[email protected]>
Unify numTouchEventHandlersChanged and needTouchEvents in the chrome client
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
