Changeset 17856 in webkit for trunk/JavaScriptCore/kjs/config.h

Timestamp:

Nov 20, 2006, 4:59:36 AM (19 years ago)

Author:

bdash

Message:

2006-11-20 Samuel Weinig <​[email protected]>

Reviewed by Maciej.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=11647
Fix Win32 build

• kjs/config.h: define NOMINMAX instead of min/max as themselves.
• wtf/Vector.h: put back hack to ensure that min/max are not defined as macros.

2006-11-20 Samuel Weinig <​[email protected]>

Reviewed by Maciej.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=11647
Fix Win32 build

• config.h: add #define NOMINMAX for windows build
• platform/win/FontCacheWin.cpp: (WebCore::FontCache::createFontPlatformData):
• platform/win/TemporaryLinkStubs.cpp: add definitions for new cursors. (WebCore::aliasCursor): (WebCore::noDropCursor): (WebCore::progressCursor):

File:

• trunk/JavaScriptCore/kjs/config.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/config.h

@@ +1 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006 Samuel Weinig <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
 #include <wtf/Platform.h>
 
@@ -15 +36 @@
 #elif PLATFORM(WIN_OS)
 
-// If we don't define these, they get defined in windef.h. 
-// We want to use std::min and std::max
-#define max max
-#define min min
+// We need to define this in order to use the numeric limit 
+// values provided by the C++ standard library.
+#define NOMINMAX
 
 #define HAVE_FLOAT_H 1
 #define HAVE_FUNC__FINITE 1
 #define HAVE_SYS_TIMEB_H 1
-
 
 #define USE_SYSTEM_MALLOC 1