diff options
Diffstat (limited to 'Source/JavaScriptCore/runtime/JSExportMacros.h')
| -rw-r--r-- | Source/JavaScriptCore/runtime/JSExportMacros.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/JavaScriptCore/runtime/JSExportMacros.h b/Source/JavaScriptCore/runtime/JSExportMacros.h index 77e4b0a33..126cbc923 100644 --- a/Source/JavaScriptCore/runtime/JSExportMacros.h +++ b/Source/JavaScriptCore/runtime/JSExportMacros.h @@ -10,10 +10,10 @@ * 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 + * THIS SOFTWARE IS PROVIDED BY APPLE 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 + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE 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 @@ -27,10 +27,8 @@ * properly on all platforms and compilers that WebKit builds under. */ -#ifndef JSExportMacros_h -#define JSExportMacros_h +#pragma once -#include <wtf/Platform.h> #include <wtf/ExportMacros.h> // See note in wtf/Platform.h for more info on EXPORT_MACROS. @@ -48,7 +46,7 @@ #else // !USE(EXPORT_MACROS) -#if OS(WINDOWS) && !COMPILER(GCC) +#if OS(WINDOWS) && !COMPILER(GCC_OR_CLANG) #if defined(BUILDING_JavaScriptCore) || defined(STATICALLY_LINKED_WITH_JavaScriptCore) #define JS_EXPORTDATA __declspec(dllexport) @@ -69,5 +67,3 @@ #define JS_EXPORT_HIDDEN #endif // USE(EXPORT_MACROS) - -#endif // JSExportMacros_h |