ICU-57149.0.1.tar.gz

[apple/icu.git] / icuSources / io / ustdio.c

diff --git a/icuSources/io/ustdio.c b/icuSources/io/ustdio.c
index df4c4f1c37c4441f49d09e8f81eac7843c35db24..6c910baa9a7290703605a42a1fed98d119b3bfbc 100644 (file)
--- a/icuSources/io/ustdio.c
+++ b/icuSources/io/ustdio.c
@@ -1,7 +1,7 @@
 /*
  ******************************************************************************
  *
- *   Copyright (C) 1998-2011, International Business Machines
+ *   Copyright (C) 1998-2016, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *
  ******************************************************************************
@@ -18,6 +18,9 @@
  */
 
 #include "unicode/ustdio.h"
+
+#if !UCONFIG_NO_CONVERSION
+
 #include "unicode/putil.h"
 #include "cmemory.h"
 #include "cstring.h"
@@ -293,7 +296,7 @@ u_fputc(UChar32      uc,
     int32_t idx = 0;
     UBool isError = FALSE;
 
-    U16_APPEND(buf, idx, sizeof(buf)/sizeof(*buf), uc, isError);
+    U16_APPEND(buf, idx, UPRV_LENGTHOF(buf), uc, isError);
     if (isError) {
         return U_EOF;
     }
@@ -425,7 +428,7 @@ ufile_fill_uchar_buffer(UFILE *f)
 
     /* shift the buffer if it isn't empty */
     if(dataSize != 0) {
-        uprv_memmove(f->fUCBuffer, str->fPos, dataSize * sizeof(UChar)); /* not accessing beyond memory */
+        u_memmove(f->fUCBuffer, str->fPos, dataSize); /* not accessing beyond memory */
     }
 
 
@@ -724,3 +727,4 @@ u_file_read(    UChar        *chars,
 
     return read;
 }
+#endif