diff options
Diffstat (limited to 'Tools/DumpRenderTree/DumpRenderTreePrefix.h')
| -rw-r--r-- | Tools/DumpRenderTree/DumpRenderTreePrefix.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Tools/DumpRenderTree/DumpRenderTreePrefix.h b/Tools/DumpRenderTree/DumpRenderTreePrefix.h index 010ca019d..105b54356 100644 --- a/Tools/DumpRenderTree/DumpRenderTreePrefix.h +++ b/Tools/DumpRenderTree/DumpRenderTreePrefix.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. + * Copyright (C) 2005 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,7 +10,7 @@ * 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. - * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -26,17 +26,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef __OBJC__ - -#import <Foundation/Foundation.h> - +#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE) +#include "cmakeconfig.h" #endif -#if defined(WIN32) || defined(_WIN32) +#include <wtf/Platform.h> -// 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 +#ifdef __OBJC__ +#import <Foundation/Foundation.h> +#endif +#if OS(WINDOWS) +#undef WEBCORE_EXPORT +#define WEBCORE_EXPORT WTF_IMPORT_DECLARATION #endif |