Commit 467ab6fc authored by ap's avatar ap
Browse files

2006-09-01 Nikolas Zimmermann <zimmermann@kde.org>

        Reviewed and landed by ap.

        Fix build on Linux (C89 without gcc extensions enabled).

        * pcre/pcre_internal.h: Use C style comments.
        * wtf/Assertions.h: Use C style comments.
        * wtf/Platform.h: Use C style comments.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@16177 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7ab7c579
2006-09-01 Nikolas Zimmermann <zimmermann@kde.org>
Reviewed and landed by ap.
Fix build on Linux (C89 without gcc extensions enabled).
* pcre/pcre_internal.h: Use C style comments.
* wtf/Assertions.h: Use C style comments.
* wtf/Platform.h: Use C style comments.
2006-09-01 Steve Falkenburg <sfalken@apple.com>
 
Fix build.
......
......@@ -41,8 +41,8 @@ POSSIBILITY OF SUCH DAMAGE.
#include "Assertions.h"
// Added to prevent 64-to-32 shortening warnings when compiling for 64-bit
// <rdar://problem/4712064> PCRE generates many warnings with -Wshorten-64-to-32
/* Added to prevent 64-to-32 shortening warnings when compiling for 64-bit
<rdar://problem/4712064> PCRE generates many warnings with -Wshorten-64-to-32 */
#if defined(__GNUC__) && defined(__LP64__)
#define INT_CAST(i) (int)(i); ASSERT((i) <= INT_MAX)
#else
......
// -*- mode: c++; c-basic-offset: 4 -*-
/* -*- mode: c++; c-basic-offset: 4 -*- */
/*
* Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved.
*
......@@ -27,13 +27,15 @@
#ifndef KXMLCORE_ASSERTIONS_H
#define KXMLCORE_ASSERTIONS_H
// no namespaces because this file has to be includable from C and Objective-C
/*
no namespaces because this file has to be includable from C and Objective-C
// Note, this file uses many GCC extensions, but it should be compatible with
// C, Objective C, C++, and Objective C++.
Note, this file uses many GCC extensions, but it should be compatible with
C, Objective C, C++, and Objective C++.
// For non-debug builds, everything is disabled by default.
// Defining any of the symbols explicitly prevents this from having any effect.
For non-debug builds, everything is disabled by default.
Defining any of the symbols explicitly prevents this from having any effect.
*/
#include "Platform.h"
......@@ -69,7 +71,7 @@
#define KXMLCORE_PRETTY_FUNCTION __FUNCTION__
#endif
// These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled.
/* These helper functions are always declared, but not necessarily always defined if the corresponding function is disabled. */
#ifdef __cplusplus
extern "C" {
......@@ -94,14 +96,14 @@ void WTFLog(const char *file, int line, const char *function, WTFLogChannel *cha
}
#endif
// CRASH -- gets us into the debugger or the crash reporter -- signals are ignored by the crash reporter so we must do better
/* CRASH -- gets us into the debugger or the crash reporter -- signals are ignored by the crash reporter so we must do better */
#define CRASH() *(int *)(uintptr_t)0xbbadbeef = 0
// ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED
/* ASSERT, ASSERT_WITH_MESSAGE, ASSERT_NOT_REACHED */
#if PLATFORM(WIN_OS)
// FIXME: Change to use something other than ASSERT to avoid this conflict with win32.
/* FIXME: Change to use something other than ASSERT to avoid this conflict with win32. */
#undef ASSERT
#endif
......@@ -132,7 +134,7 @@ while (0)
#endif
// ASSERT_ARG
/* ASSERT_ARG */
#if ASSERT_ARG_DISABLED
......@@ -149,7 +151,7 @@ while (0)
#endif
// FATAL
/* FATAL */
#if FATAL_DISABLED
#define FATAL(...) ((void)0)
......@@ -160,7 +162,7 @@ while (0)
} while (0)
#endif
// LOG_ERROR
/* LOG_ERROR */
#if ERROR_DISABLED
#define LOG_ERROR(...) ((void)0)
......@@ -168,7 +170,7 @@ while (0)
#define LOG_ERROR(...) WTFReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__)
#endif
// LOG
/* LOG */
#if LOG_DISABLED
#define LOG(channel, ...) ((void)0)
......
......@@ -166,7 +166,7 @@
/* for Unicode, KDE uses Qt, everything else uses ICU */
#if PLATFORM(KDE)
// FIXME: Not using Qt4 unicode for now!
/* FIXME: Not using Qt4 unicode for now! */
#define KXMLCORE_USE_ICU_UNICODE 1
#else
#define KXMLCORE_USE_ICU_UNICODE 1
......
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