Changeset 12897 in webkit for trunk/JavaScriptCore/kxmlcore/Assertions.h

Timestamp:

Feb 19, 2006, 9:20:40 AM (19 years ago)

Author:

darin

Message:

• renamed ERROR to LOG_ERROR to fix build presumably Maciej had this change and forgot to land it

• kjs/collector.cpp: Removed now-unneeded #undef ERROR.
• kxmlcore/Assertions.h: Renamed ERROR to LOG_ERROR.
• kxmlcore/FastMalloc.cpp: Changed MESSAGE macro to use LOG_ERROR.

File:

• trunk/JavaScriptCore/kxmlcore/Assertions.h (modified) (2 diffs)

trunk/JavaScriptCore/kxmlcore/Assertions.h

@@ -1 +1 @@
 // -*- mode: c++; c-basic-offset: 4 -*-
 /*
- * Copyright (C) 2003 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -158 +158 @@
 #endif
 
-// ERROR
+// LOG_ERROR
 
 #if ERROR_DISABLED
-#define ERROR(...) ((void)0)
+#define LOG_ERROR(...) ((void)0)
 #else
-#define ERROR(...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__)
+#define LOG_ERROR(...) KXCReportError(__FILE__, __LINE__, KXMLCORE_PRETTY_FUNCTION, __VA_ARGS__)
 #endif