ICU-573 unchange the definition of NULL (remove the "defined(__cplusplus)")

X-SVN-Rev: 2370
This commit is contained in:
George Rhoten 2000-08-28 23:25:10 +00:00
parent e987689c07
commit 6ac419ab8a

View File

@ -100,7 +100,7 @@ updates come out. */
/* Define NULL (the wrong way, cast to void *) if it does not exist. */
#ifndef NULL
#if defined(XP_CPLUSPLUS) || defined(__cplusplus)
#ifdef XP_CPLUSPLUS
#define NULL 0
#else
#define NULL ((void *)0)
@ -208,8 +208,8 @@ enum UErrorCode {
U_USING_DEFAULT_ERROR = -127,
U_ERROR_INFO_LIMIT,
/** success */
U_ZERO_ERROR = 0,
/** success */
U_ZERO_ERROR = 0,
U_ILLEGAL_ARGUMENT_ERROR = 1, /* Start of codes indicating failure */
U_MISSING_RESOURCE_ERROR = 2,