ICU-8601 fix extern-variable C/C++ mismatch in genrb (broke Windows)

X-SVN-Rev: 30155

diff --git a/icu4c/source/tools/genrb/errmsg.h b/icu4c/source/tools/genrb/errmsg.h
index 545a872906d081fb6a7a00227ad46a55ca39b441..190a61ebe179dfbd407517a08b20c63f5b3a1c24 100644 (file)
--- a/icu4c/source/tools/genrb/errmsg.h
+++ b/icu4c/source/tools/genrb/errmsg.h
@@ -18,6 +18,8 @@
 #ifndef ERROR_H
 #define ERROR_H 1
 
+U_CDECL_BEGIN
+
 extern const char *gCurrentFileName;
 
 U_CFUNC void error(uint32_t linenumber, const char *msg, ...);
@@ -34,4 +36,7 @@ U_CFUNC UBool isStrict(void);
 /* verbosity */
 U_CFUNC void setVerbose(UBool val);
 U_CFUNC UBool isVerbose(void);
+
+U_CDECL_END
+
 #endif

diff --git a/icu4c/source/tools/genrb/genrb.h b/icu4c/source/tools/genrb/genrb.h
index 4423ce727e58864e78c5f6396faa1933bb105cab..cf4562457f02e25529024a016e6a94ebf72aec46 100644 (file)
--- a/icu4c/source/tools/genrb/genrb.h
+++ b/icu4c/source/tools/genrb/genrb.h
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2002-2010, International Business Machines
+*   Copyright (C) 2002-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -39,6 +39,10 @@
 /* The version of genrb */
 #define GENRB_VERSION "3.3"
 
+U_CDECL_BEGIN
+
+extern UBool gIncludeUnihanColl;
+
 U_CAPI void processFile(
     const char *filename,
     const char* cp,
@@ -47,4 +51,6 @@ U_CAPI void processFile(
     const char *packageName,
     UErrorCode *status);
 
+U_CDECL_END
+
 #endif

diff --git a/icu4c/source/tools/genrb/parse.cpp b/icu4c/source/tools/genrb/parse.cpp
index d990d4622120a1c791fe223039b89daf27988e95..1c3ddf21e487bb817e18cde3540ffde3bc0eed99 100644 (file)
--- a/icu4c/source/tools/genrb/parse.cpp
+++ b/icu4c/source/tools/genrb/parse.cpp
@@ -35,8 +35,6 @@
 #include "unicode/putil.h"
 #include <stdio.h>
 
-extern UBool gIncludeUnihanColl;
-
 /* Number of tokens to read ahead of the current stream position */
 #define MAX_LOOKAHEAD   3