meson: fix internal printf for %ll format modifier on 32-bit systems
authorTim-Philipp Müller <tim@centricular.com>
Sat, 24 Sep 2016 17:06:31 +0000 (18:06 +0100)
committerTim-Philipp Müller <tim@centricular.com>
Sat, 24 Sep 2016 17:12:46 +0000 (18:12 +0100)
gst/gstprintf unit test would fail on 32-bit x86 with:
gstprintf.c:83:printf_I32_I64:0: 'str' (64-bit x value = b5a6978f) is not equal to '"64-bit x value = f1e2d3c4b5a6978f"'

gst/printf/meson.build

index 8e4122a..2a867a6 100644 (file)
@@ -7,14 +7,69 @@ printf_sources = [
   'printf-extension.c',
 ]
 
-printf_args = gst_c_args + [
-#  '-UHAVE_LONG_DOUBLE',
-#  '-UHAVE_LONG_LONG_FORMAT',
-#  ' -UHAVE_WCHAR_T',
-#  '-UHAVE_WCSLEN',
-#  '-UHAVE_WINT_T',
-  '-DSTATIC=G_GNUC_INTERNAL',
-]
+printf_args = gst_c_args + ['-DSTATIC=G_GNUC_INTERNAL']
+
+# Don't have a need for that and it's not portable so just ignore for now
+printf_args += ['-UHAVE_LONG_DOUBLE']
+
+# Just use internal emulation for printing long longs for now
+printf_args += ['-UHAVE_LONG_LONG_FORMAT']
+
+# Don't need any of this widechar stuff, so just disable it for now
+printf_args += ['-UHAVE_WCHAR_T', '-UHAVE_WCSLEN', '-UHAVE_WINT_T']
+
+# Check if 'long long' works and what format can be used to print it
+# jm_AC_TYPE_LONG_LONG
+if cc.compiles('''long long ll = 1LL;
+                  int i = 63;
+                  int some_func (void) {
+                    long long llmax = (long long) -1;
+                    return ll << i | ll >> i | llmax / ll | llmax % ll;
+                  }''', name : 'long long')
+  printf_args += ['-DHAVE_LONG_LONG']
+  have_long_long = true
+else
+  have_long_long = false
+endif
+
+# The following uintmax_t/intmax_t checks are also in glib
+found_uintmax_t = false
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+# jm_AC_HEADER_INTTYPES_H
+if cc.compiles('''#include <sys/types.h>
+                  #include <inttypes.h>
+                  uintmax_t i = (uintmax_t) -1;
+               ''', name : 'uintmax_t in inttypes.h')
+  printf_args += ['-DHAVE_INTTYPES_H_WITH_UINTMAX']
+  found_uintmax_t = true
+endif
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+# jm_AC_HEADER_STDINT_H
+if cc.compiles('''#include <sys/types.h>
+                  #include <stdint.h>
+                  uintmax_t i = (uintmax_t) -1;
+               ''', name : 'uintmax_t in stdint.h')
+  printf_args += ['-DHAVE_STDINT_H_WITH_UINTMAX']
+  found_uintmax_t = true
+endif
+
+
+# Define intmax_t to 'long' or 'long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+# For simplicity, we assume that a header file defines 'intmax_t'
+# if and only if it defines 'uintmax_t'.
+printf_args += ['-DHAVE_INTMAX_T']
+if not found_uintmax_t
+  if have_long_long
+    printf_args += ['-Dintmax_t=long long']
+  else
+    printf_args += ['-Dintmax_t=long']
+  endif
+endif
 
 printf_lib = static_library('gstprintf',
     printf_sources,