2006-11-20 Samuel Weinig <sam@webkit.org>

        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  <sam@webkit.org>

        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):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17856 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 04d63b1070f6fa392a46dceb33b264466e4e5bbe..bfe3f5b1c14a6a8e7937a83a0e9ff7b1e1656a6e 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-20  Samuel Weinig  <sam@webkit.org>
+
+        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-19  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Zack.

diff --git a/JavaScriptCore/kjs/config.h b/JavaScriptCore/kjs/config.h
index 7031fbe5fdc50a7f24db87fd5fb59a8015527a1a..134c2a9f55cdb4b735dfb7d8d8023e75b36227fd 100644 (file)
--- a/JavaScriptCore/kjs/config.h
+++ b/JavaScriptCore/kjs/config.h
@@ -1,3 +1,24 @@
+/*
+ * Copyright (C) 2006 Apple Computer, Inc.
+ * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
+ *
+ * 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>
 
 #if PLATFORM(DARWIN)
@@ -14,16 +35,14 @@
 
 #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
 
 #else

diff --git a/JavaScriptCore/wtf/Vector.h b/JavaScriptCore/wtf/Vector.h
index 496f1c761ed69bded8790580dd0ef1afd953b194..bf8d94ae970165d5ce2421e52bbb42dec61de5d8 100644 (file)
--- a/JavaScriptCore/wtf/Vector.h
+++ b/JavaScriptCore/wtf/Vector.h
@@ -30,6 +30,16 @@
 #include <stdlib.h>
 #include <utility>
 
+// FIXME: For unknown reasons defining NOMINMAX is not preventing the
+// min and max macros from being defined on Win32.
+#ifdef max
+#undef max
+#endif
+
+#ifdef min
+#undef min
+#endif
+
 namespace WTF {
 
     using std::min;

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 907967a9e652b227cc518432733981942c0d3338..b40aca346e3860107c2097aeca71a53389fed594 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2006-11-20  Samuel Weinig  <sam@webkit.org>
+
+        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):
+
 2006-11-19  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Adam.

diff --git a/WebCore/config.h b/WebCore/config.h
index b02b54613087a0da0d7c177f1936605377e9e5e4..0647394eca8bcd5b8ff01e57daa5fa10f4ab260f 100644 (file)
--- a/WebCore/config.h
+++ b/WebCore/config.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -48,6 +49,10 @@ typedef float CGFloat;
 #define WINVER 0x0500
 #endif
 
+// We need to define this in order to use the numeric limit 
+// values provided by the C++ standard library.
+#define NOMINMAX
+
 // Hack to match configuration of JavaScriptCore.
 // Maybe there's a better way to do this.
 #define USE_SYSTEM_MALLOC 1

diff --git a/WebCore/platform/win/FontCacheWin.cpp b/WebCore/platform/win/FontCacheWin.cpp
index 8d0bcf514c7dc9a95287b83a56e604479a644a2f..824d52ec7639baf9b07c015139f7c9fd8deadd9c 100644 (file)
--- a/WebCore/platform/win/FontCacheWin.cpp
+++ b/WebCore/platform/win/FontCacheWin.cpp
@@ -28,13 +28,16 @@
 
 #include "config.h"
 #include "FontCache.h"
+
 #include "FontData.h"
 #include "Font.h"
-#include <windows.h>
+#include <algorithm>
 #include <mlang.h>
+#include <windows.h>
 
-namespace WebCore
-{
+using std::min;
+
+namespace WebCore {
 
 void FontCache::platformInit()
 {
@@ -115,7 +118,7 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
     winfont.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
     winfont.lfItalic = fontDescription.italic();
     winfont.lfWeight = fontDescription.bold() ? 700 : 400; // FIXME: Support weights for real.
-    int len = min(family.length(), LF_FACESIZE - 1);
+    int len = min(static_cast<int>(family.length()), LF_FACESIZE - 1);
     memcpy(winfont.lfFaceName, family.characters(), len * sizeof(WORD));
     winfont.lfFaceName[len] = '\0';
 

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index 7e11f550a82b5ed21cfbbbac4188753632b64450..a903d9c165a309b010892f9c8ea79ea4dada473d 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -101,9 +101,12 @@ Color focusRingColor() { notImplemented(); return 0xFF0000FF; }
 bool historyContains(DeprecatedString const&) { notImplemented(); return false; }
 String inputElementAltText() { notImplemented(); return DeprecatedString(); }
 bool IsResponseURLEqualToURL(PlatformResponse , const String&) { notImplemented(); return false; }
+const Cursor& aliasCursor() { notImplemented(); return localCursor; }
 const Cursor& cellCursor() { notImplemented(); return localCursor; }
 const Cursor& contextMenuCursor() { notImplemented(); return localCursor; }
 const Cursor& moveCursor() { notImplemented(); return localCursor; }
+const Cursor& noDropCursor() { notImplemented(); return localCursor; }
+const Cursor& progressCursor() { notImplemented(); return localCursor; }
 const Cursor& verticalTextCursor() { notImplemented(); return localCursor; }
 void refreshPlugins(bool) { notImplemented(); }
 String resetButtonDefaultLabel() { notImplemented(); return "Reset"; }