From 23b741699f041638bada8b6f2b06ec1019b1811e Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Thu, 10 Jan 2013 20:25:39 +0000 Subject: [PATCH] efl: remove check for inttypes.h and stdint.h SVN revision: 82580 --- configure.ac | 5 ----- src/lib/eina/eina_config.h.in | 10 ---------- src/lib/eina/eina_hash.c | 5 +---- src/lib/eina/eina_unicode.h | 9 +-------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/configure.ac b/configure.ac index 2c625d3ec7..b1734abc7b 100644 --- a/configure.ac +++ b/configure.ac @@ -380,11 +380,9 @@ AC_HEADER_TIME AC_CHECK_HEADERS([ \ execinfo.h \ errno.h \ -inttypes.h \ libgen.h \ mcheck.h \ netinet/in.h \ -stdint.h \ sys/epoll.h \ sys/inotify.h \ sys/signalfd.h \ @@ -804,9 +802,6 @@ CFLAGS="${CFLAGS} ${EINA_CFLAGS}" AC_CHECK_HEADERS([sys/mman.h]) CFLAGS="${CFLAGS_save}" -EINA_CONFIG([HAVE_INTTYPES_H], [test "x${ac_cv_header_inttypes_h}" = "xyes"]) -EINA_CONFIG([HAVE_STDINT_H], [test "x${ac_cv_header_stdint_h}" = "xyes"]) - ### Checks for types EINA_CONFIG([HAVE_DIRENT_H], [test "x${have_dirent}" = "xyes"]) diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in index b8ad351d6a..abcf2f98fc 100644 --- a/src/lib/eina/eina_config.h.in +++ b/src/lib/eina/eina_config.h.in @@ -38,16 +38,6 @@ #endif @EINA_CONFIGURE_SAFETY_CHECKS@ -#ifdef EINA_HAVE_INTTYPES_H -# undef EINA_HAVE_INTTYPES_H -#endif -@EINA_CONFIGURE_HAVE_INTTYPES_H@ - -#ifdef EINA_HAVE_STDINT_H -# undef EINA_HAVE_STDINT_H -#endif -@EINA_CONFIGURE_HAVE_STDINT_H@ - #ifndef EINA_HAVE_THREADS #define EINA_HAVE_THREADS #endif diff --git a/src/lib/eina/eina_hash.c b/src/lib/eina/eina_hash.c index 594d54ac40..fc6b7aac51 100644 --- a/src/lib/eina/eina_hash.c +++ b/src/lib/eina/eina_hash.c @@ -23,12 +23,9 @@ #include #include +#include #include -#ifdef HAVE_STDINT_H -# include -#endif - #ifdef _MSC_VER # include #endif diff --git a/src/lib/eina/eina_unicode.h b/src/lib/eina/eina_unicode.h index 705ec7ba02..af5cbca4d8 100644 --- a/src/lib/eina/eina_unicode.h +++ b/src/lib/eina/eina_unicode.h @@ -28,18 +28,11 @@ #if EINA_SIZEOF_WCHAR_T >= 4 # include typedef wchar_t Eina_Unicode; -#elif defined(EINA_HAVE_INTTYPES_H) +#else # include typedef uint32_t Eina_Unicode; -#elif defined(EINA_HAVE_STDINT_H) -# include -typedef uint32_t Eina_Unicode; -#else -/* Hope that int is big enough */ -typedef unsigned int Eina_Unicode; #endif - /** * @brief Same as the standard strlen just with Eina_Unicode instead of char. */