[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:59:53 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2f162b8b839a5b99bf27cced0a225f974e3c77fc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Apr 1 20:01:18 2002 +0000
JavaScriptCore:
Got rid of KWQDef.h because it's dangerous to have two files with
the same name and different contents.
* JavaScriptCore.pbproj/project.pbxproj:
* kjs/KWQDef.h: Removed.
* kjs/ustring.h: Defines unsigned int types inline now.
WebCore:
* src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
in JavaScriptCore that has to do the same thing.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@918 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1dcef3f..ea4e858 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2002-04-01 Darin Adler <darin at apple.com>
+
+ Got rid of KWQDef.h because it's dangerous to have two files with
+ the same name and different contents.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ * kjs/KWQDef.h: Removed.
+ * kjs/ustring.h: Defines unsigned int types inline now.
+
2002-03-30 Maciej Stachowiak <mjs at apple.com>
Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 1dcef3f..ea4e858 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-04-01 Darin Adler <darin at apple.com>
+
+ Got rid of KWQDef.h because it's dangerous to have two files with
+ the same name and different contents.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ * kjs/KWQDef.h: Removed.
+ * kjs/ustring.h: Defines unsigned int types inline now.
+
2002-03-30 Maciej Stachowiak <mjs at apple.com>
Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 1dcef3f..ea4e858 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-04-01 Darin Adler <darin at apple.com>
+
+ Got rid of KWQDef.h because it's dangerous to have two files with
+ the same name and different contents.
+
+ * JavaScriptCore.pbproj/project.pbxproj:
+ * kjs/KWQDef.h: Removed.
+ * kjs/ustring.h: Defines unsigned int types inline now.
+
2002-03-30 Maciej Stachowiak <mjs at apple.com>
Fixed Radar 2891272 (JavaScript crashes loading quicktime.com and
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 8941be7..f06d259 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -205,7 +205,6 @@
F692A8CC02555BA201FF60F7,
F692A8CD02555BA201FF60F7,
F68EBB8E0255D4C601FF60F7,
- F68EBB8F0255D4C601FF60F7,
);
isa = PBXHeadersBuildPhase;
};
@@ -360,7 +359,6 @@
F692A8870255597D01FF60F7,
F692A8880255597D01FF60F7,
F68EBB8C0255D4C601FF60F7,
- F68EBB8D0255D4C601FF60F7,
);
isa = PBXGroup;
name = Classes;
@@ -421,12 +419,6 @@
path = kjs/config.h;
refType = 4;
};
- F68EBB8D0255D4C601FF60F7 = {
- isa = PBXFileReference;
- name = KWQDef.h;
- path = kjs/KWQDef.h;
- refType = 4;
- };
F68EBB8E0255D4C601FF60F7 = {
fileRef = F68EBB8C0255D4C601FF60F7;
isa = PBXBuildFile;
@@ -436,15 +428,6 @@
);
};
};
- F68EBB8F0255D4C601FF60F7 = {
- fileRef = F68EBB8D0255D4C601FF60F7;
- isa = PBXBuildFile;
- settings = {
- ATTRIBUTES = (
- Public,
- );
- };
- };
F692A84D0255597D01FF60F7 = {
isa = PBXFileReference;
name = array_object.cpp;
diff --git a/JavaScriptCore/kjs/KWQDef.h b/JavaScriptCore/kjs/KWQDef.h
deleted file mode 100644
index b3fb19c..0000000
--- a/JavaScriptCore/kjs/KWQDef.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef KWQDEF_H_
-#define KWQDEF_H_
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-typedef unsigned char uchar;
-typedef unsigned short ushort;
-typedef unsigned uint;
-typedef unsigned long ulong;
-
-#endif
diff --git a/JavaScriptCore/kjs/ustring.h b/JavaScriptCore/kjs/ustring.h
index 0f0790b..03c87a3 100644
--- a/JavaScriptCore/kjs/ustring.h
+++ b/JavaScriptCore/kjs/ustring.h
@@ -29,7 +29,13 @@
#endif
#ifdef APPLE_CHANGES
-#include <KWQDef.h>
+#ifndef KWQ_UNSIGNED_TYPES_DEFINED
+#define KWQ_UNSIGNED_TYPES_DEFINED
+typedef unsigned char uchar;
+typedef unsigned short ushort;
+typedef unsigned uint;
+typedef unsigned long ulong;
+#endif
#endif
/**
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index d050354..0e6425a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
2002-04-01 Darin Adler <darin at apple.com>
+ * src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
+ in JavaScriptCore that has to do the same thing.
+
+2002-04-01 Darin Adler <darin at apple.com>
+
* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::restoreScrollBar): Disable code
that checks if the scroll bar is visible, because it currently doesn't do us
any good. We may want to turn it back on if we ever implement setVScrollBarMode.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index d050354..0e6425a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
2002-04-01 Darin Adler <darin at apple.com>
+ * src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
+ in JavaScriptCore that has to do the same thing.
+
+2002-04-01 Darin Adler <darin at apple.com>
+
* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::restoreScrollBar): Disable code
that checks if the scroll bar is visible, because it currently doesn't do us
any good. We may want to turn it back on if we ever implement setVScrollBarMode.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d050354..0e6425a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
2002-04-01 Darin Adler <darin at apple.com>
+ * src/kwq/KWQDef.h: Use KWQ_UNSIGNED_TYPES_DEFINED for compatibility with code
+ in JavaScriptCore that has to do the same thing.
+
+2002-04-01 Darin Adler <darin at apple.com>
+
* src/kdelibs/khtml/khtmlview.cpp: (KHTMLView::restoreScrollBar): Disable code
that checks if the scroll bar is visible, because it currently doesn't do us
any good. We may want to turn it back on if we ever implement setVScrollBarMode.
diff --git a/WebCore/kwq/KWQDef.h b/WebCore/kwq/KWQDef.h
index eb749d7..192826a 100644
--- a/WebCore/kwq/KWQDef.h
+++ b/WebCore/kwq/KWQDef.h
@@ -30,10 +30,13 @@
#include <config.h>
#endif
+#ifndef KWQ_UNSIGNED_TYPES_DEFINED
+#define KWQ_UNSIGNED_TYPES_DEFINED
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef unsigned uint;
typedef unsigned long ulong;
+#endif
typedef char Q_INT8;
typedef short Q_INT16;
diff --git a/WebCore/src/kwq/KWQDef.h b/WebCore/src/kwq/KWQDef.h
index eb749d7..192826a 100644
--- a/WebCore/src/kwq/KWQDef.h
+++ b/WebCore/src/kwq/KWQDef.h
@@ -30,10 +30,13 @@
#include <config.h>
#endif
+#ifndef KWQ_UNSIGNED_TYPES_DEFINED
+#define KWQ_UNSIGNED_TYPES_DEFINED
typedef unsigned char uchar;
typedef unsigned short ushort;
typedef unsigned uint;
typedef unsigned long ulong;
+#endif
typedef char Q_INT8;
typedef short Q_INT16;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list