diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2018-06-05 23:32:20 +0000 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-06-05 23:32:20 +0000 |
| commit | 02bac349217759aaf8c46ca9f308602911e98016 (patch) | |
| tree | c608452fd9228d1de4e0e46cb8bcdedcabb3cd34 | |
| parent | 8683e029be90e871ebfea8ce225d2bbc268f8169 (diff) | |
| parent | 65bd090d576cddb9a106ff765f4ef509121e1aa9 (diff) | |
| download | glib-02bac349217759aaf8c46ca9f308602911e98016.tar.gz | |
Merge branch 'drop-unused-defines' into 'master'
Remove unused HAVE_LONG_LONG_FORMAT and HAVE_LONG_LONG_FORMAT
See merge request GNOME/glib!63
| -rw-r--r-- | config.h.meson | 3 | ||||
| -rw-r--r-- | config.h.win32.in | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | meson.build | 3 |
4 files changed, 1 insertions, 14 deletions
diff --git a/config.h.meson b/config.h.meson index 65ae3a676..bf1cfdbbb 100644 --- a/config.h.meson +++ b/config.h.meson @@ -268,9 +268,6 @@ /* Define if you have the 'long long' type. */ #mesondefine HAVE_LONG_LONG -/* define if system printf can print long long */ -#mesondefine HAVE_LONG_LONG_FORMAT - /* Define to 1 if you have the `lstat' function. */ #mesondefine HAVE_LSTAT diff --git a/config.h.win32.in b/config.h.win32.in index d104b143f..25ff47252 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -269,9 +269,6 @@ /* Define if you have the 'long long' type. */ #define HAVE_LONG_LONG 1 -/* define if system printf can print long long */ -/* #undef HAVE_LONG_LONG_FORMAT */ - /* Define to 1 if you have the `lstat' function. */ /* #undef HAVE_LSTAT */ diff --git a/configure.ac b/configure.ac index 5e39668b1..9ccedcdfc 100644 --- a/configure.ac +++ b/configure.ac @@ -533,10 +533,6 @@ AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], done]) AS_IF([ test -n "$glib_cv_long_long_format"], [ AC_MSG_RESULT(%${glib_cv_long_long_format}u) - AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long]) - if test x"$glib_cv_long_long_format" = xI64; then - AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64]) - fi ], [AC_MSG_RESULT(none)]) ],[ test x$ac_cv_sizeof___int64 = x8], [ # __int64 is a 64 bit integer. @@ -544,8 +540,6 @@ AS_IF([test x$glib_native_win32 != xyes && test x$ac_cv_sizeof_long_long = x8], # We know this is MSVCRT.DLL, and what the formats are glib_cv_long_long_format=I64 AC_MSG_RESULT(%${glib_cv_long_long_format}u) - AC_DEFINE(HAVE_LONG_LONG_FORMAT,1,[define if system printf can print long long]) - AC_DEFINE(HAVE_INT64_AND_I64,1,[define to support printing 64-bit integers with format I64]) ]) AC_C_CONST diff --git a/meson.build b/meson.build index 1ab06a44d..4b6811fff 100644 --- a/meson.build +++ b/meson.build @@ -961,9 +961,8 @@ if cc.links('''#include <signal.h> glib_conf.set('HAVE_SIG_ATOMIC_T', 1) endif -# Check if 'long long' works and what format can be used to print it +# Check if 'long long' works # jm_AC_TYPE_LONG_LONG -# Nothing uses HAVE_LONG_LONG_FORMAT and HAVE_INT64_AND_I64 if cc.compiles('''long long ll = 1LL; int i = 63; int some_func (void) { |