Commit f119028c authored by mjs's avatar mjs
Browse files

Reviewed by Eric.

	- fix windows build, broken by my last patch

        * kjs/JSImmediate.cpp:
        * kjs/identifier.cpp:
        * kxmlcore/FastMalloc.cpp:
        * kxmlcore/Platform.h:



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13091 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 634e7e27
2006-03-02 Maciej Stachowiak <mjs@apple.com>
Reviewed by Eric.
- fix windows build, broken by my last patch
* kjs/JSImmediate.cpp:
* kjs/identifier.cpp:
* kxmlcore/FastMalloc.cpp:
* kxmlcore/Platform.h:
2006-03-01 Maciej Stachowiak <mjs@apple.com>
Reviewed by Darin.
......
......@@ -19,6 +19,7 @@
*
*/
#include "config.h"
#include "JSImmediate.h"
#include "kxmlcore/Assertions.h"
#include "object.h"
......
......@@ -19,6 +19,9 @@
*
*/
#include "config.h"
#include "identifier.h"
// For JavaScriptCore we need to avoid having static constructors.
// Our strategy is to declare the global objects with a different type (initialized to 0)
// and then use placement new to initialize the global objects later. This is not completely
......@@ -27,15 +30,14 @@
#if !PLATFORM(WIN_OS) // can't get this to compile on Visual C++ yet
#define AVOID_STATIC_CONSTRUCTORS 1
#else
#define AVOID_STATIC_CONSTRUCTORS 0
#endif
#if AVOID_STATIC_CONSTRUCTORS
#define KJS_IDENTIFIER_HIDE_GLOBALS 1
#endif
#include "config.h"
#include "identifier.h"
#include <kxmlcore/FastMalloc.h>
#include <kxmlcore/HashSet.h>
#include <string.h> // for strlen
......
......@@ -97,7 +97,7 @@ void *fastRealloc(void* p, size_t n)
return realloc(p, n);
}
#if PLATFORM(WIN_OS)
#if !PLATFORM(WIN_OS)
void fastMallocRegisterThread(pthread_t)
{
}
......
......@@ -28,10 +28,10 @@
#define KXMLCORE_PLATFORM_H
// PLATFORM handles OS, operating environment, graphics API, and CPU
#define PLATFORM(FEATURE) (defined(KXMLCORE_PLATFORM_##FEATURE) && KXMLCORE_PLATFORM_##FEATURE)
#define COMPILER(FEATURE) (defined(KXMLCORE_COMPILER_##FEATURE) && KXMLCORE_COMPILER_##FEATURE)
#define HAVE(FEATURE) (defined(HAVE_##FEATURE) && HAVE_##FEATURE)
#define USE(FEATURE) (defined(KXMLCORE_USE_##FEATURE) && KXMLCORE_USE_##FEATURE)
#define PLATFORM(KX_FEATURE) (defined( KXMLCORE_PLATFORM_##KX_FEATURE ) && KXMLCORE_PLATFORM_##KX_FEATURE)
#define COMPILER(KX_FEATURE) (defined( KXMLCORE_COMPILER_##KX_FEATURE ) && KXMLCORE_COMPILER_##KX_FEATURE)
#define HAVE(KX_FEATURE) (defined( HAVE_##KX_FEATURE ) && HAVE_##KX_FEATURE)
#define USE(KX_FEATURE) (defined( KXMLCORE_USE_##KX_FEATURE ) && KXMLCORE_USE_##KX_FEATURE)
// Operating systems - low-level dependencies
......@@ -125,7 +125,7 @@
// Compiler
// COMPILER(MSVC)
#if defined(_MSC_Ver)
#if defined(_MSC_VER)
#define KXMLCORE_COMPILER_MSVC 1
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment