ICU-7622 Merge r27931 and r27932 for ticket #7580.

X-SVN-Rev: 27943

diff --git a/source/common/icuplug.c b/source/common/icuplug.c
index 93cf602662793849f8debbd56742cb9ee6453c12..4fd77f3f69d79c26e5e71fb30b5f28d107fb8ed7 100644 (file)
--- a/source/common/icuplug.c
+++ b/source/common/icuplug.c
@@ -692,7 +692,7 @@ static void uplug_loadWaitingPlugs(UErrorCode *status) {
     
 #if UPLUG_TRACE
   DBG((stderr,  " Done Loading Plugs. Level: %d\n", (int32_t)uplug_getCurrentLevel()));
-#endif;
+#endif
 }
 
 #if U_ENABLE_DYLOAD

diff --git a/source/config/icu-config-bottom b/source/config/icu-config-bottom
index 8a7c9f1951a027e24634828f4966bf28ab869ea9..53a9062c9fa45b166be776149b009deeda40b98b 100644 (file)
--- a/source/config/icu-config-bottom
+++ b/source/config/icu-config-bottom
@@ -264,15 +264,15 @@ do
            ;;
 
        --ldflags-icuio)
-           echo $ECHO_N " ${ICULIBS_ICUIO}${ECHO_C}"
+           echo $ECHO_N " ${ICULIBS_ICUIO} ${ECHO_C}"
            ;;
 
        --ldflags-obsolete)
-           echo $ECHO_N "${ICULIBS_OBSOLETE}${ECHO_C}"
+           echo $ECHO_N "${ICULIBS_OBSOLETE} ${ECHO_C}"
            ;;
 
        --ldflags-toolutil)
-           echo $ECHO_N " ${ICULIBS_TOOLUTIL}${ECHO_C}"
+           echo $ECHO_N " ${ICULIBS_TOOLUTIL} ${ECHO_C}"
            ;;
 
        --ldflags-layout)