[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.1.14-183-gfc90659

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit e7d185c322b8430509e6669d908975210d0ec425
Merge: f7e24bbe25f65733bde9a39988ad1662426c8d4c cbfd631780970fa6b68b02d27cdf85b2cecd5ba9
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Wed Sep 9 10:05:57 2009 -0300

    Merge branch 'webkit-1.1' into debian/experimental

diff --combined JavaScriptCore/wtf/Platform.h
index 783ce28,df57f0f..9e83bff
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@@ -276,13 -276,6 +276,13 @@@
  #define WTF_PLATFORM_X86_64 1
  #endif
  
 +/* PLATFORM(SPARC) */
 +#if   defined(__sparc__) \
 +   || defined(__sparc)
 +#define WTF_PLATFORM_SPARC 1
 +#define WTF_PLATFORM_BIG_ENDIAN 1
 +#endif
 +
  /* PLATFORM(SH4) */
  #if defined(__SH4__)
  #define WTF_PLATFORM_SH4 1
@@@ -308,16 -301,6 +308,16 @@@
  #   endif
  #endif
  
 +/* For undefined platforms */
 +#if !defined(WTF_PLATFORM_BIG_ENDIAN) && !defined(WTF_PLATFORM_MIDDLE_ENDIAN)
 +#include <sys/param.h>
 +#if __BYTE_ORDER == __BIG_ENDIAN
 +#define WTF_PLATFORM_BIG_ENDIAN 1
 +#elif  __BYTE_ORDER == __PDP_ENDIAN
 +#define WTF_PLATFORM_MIDDLE_ENDIAN 1
 +#endif
 +#endif
 +
  /* Compiler */
  
  /* COMPILER(MSVC) */
@@@ -445,8 -428,6 +445,6 @@@
  
  #if PLATFORM(WX)
  #define ENABLE_ASSEMBLER 1
- #define WTF_USE_CURL 1
- #define WTF_USE_PTHREADS 1
  #endif
  
  #if PLATFORM(GTK)
@@@ -776,4 -757,7 +774,7 @@@
  #define WARN_UNUSED_RETURN
  #endif
  
+ /* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
+ #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
+ 
  #endif /* WTF_Platform_h */

-- 
WebKit Debian packaging