Rename the ucs4 C preprocessor symbol

to a more self explaining name
liblouis · Jun 20, 2016 · d4aaee8 · d4aaee8
1 parent 60e5bf8
commit d4aaee8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -116,7 +116,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config)
 
 AC_ARG_ENABLE(ucs4,
               AC_HELP_STRING(--enable-ucs4, Enable 4 byte-wide characters),
-              [AC_DEFINE([HAVE_UCS4], [1], [Define if widechars are ucs4])],
+              [AC_DEFINE([WIDECHARS_ARE_UCS4], [1], [Define if widechars are ucs4])],
               [enable_ucs4=no])
 
 AC_MSG_CHECKING([whether 4 byte-wide characters should be supported])

diff --git a/tools/lou_trace.c b/tools/lou_trace.c
@@ -94,10 +94,10 @@ static char *
 print_chars(const widechar * buffer, int length) {
   static uint8_t result_buf[BUFSIZE];
   size_t result_len = BUFSIZE - 1;
-#ifndef HAVE_UCS4
-    u16_to_u8(buffer, length, &result_buf, &result_len);
-#else
+#ifdef WIDECHARS_ARE_UCS4
     u32_to_u8(buffer, length, &result_buf, &result_len);
+#else
+    u16_to_u8(buffer, length, &result_buf, &result_len);
 #endif
   result_buf[result_len] = 0;
   return result_buf;