aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-03-25 03:06:56 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-03-25 03:06:56 +0000
commit4965fa019e8edebdd4c3250d2fbfbba808139cb0 (patch)
treec25b3bccbcf699c5f44d2ab021a5c3fea171738f
parent1de1bfe314bb8c48b3e508f5001927988588fcf6 (diff)
downloadmpd-4965fa019e8edebdd4c3250d2fbfbba808139cb0.tar.gz
mpd-4965fa019e8edebdd4c3250d2fbfbba808139cb0.tar.xz
mpd-4965fa019e8edebdd4c3250d2fbfbba808139cb0.zip
minor fix ups for types
git-svn-id: https://svn.musicpd.org/mpd/trunk@460 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--configure.ac2
-rw-r--r--src/mp4ff/mp4ff_int_types.h10
2 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index e2b5f16f7..79b281932 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,6 +61,8 @@ AC_CHECK_SIZEOF(int)
AC_CHECK_SIZEOF(long)
AC_CHECK_SIZEOF(long long)
+AC_CHECK_HEADER(sys/inttypes.h,AC_DEFINE(HAVE_SYS_INTTYPES_H,1,[Define if sys/types.h present]),)
+
AC_CHECK_LIB(socket,socket,MPD_LIBS="$MPD_LIBS -lsocket",)
AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
diff --git a/src/mp4ff/mp4ff_int_types.h b/src/mp4ff/mp4ff_int_types.h
index 88651a81c..169086fc4 100644
--- a/src/mp4ff/mp4ff_int_types.h
+++ b/src/mp4ff/mp4ff_int_types.h
@@ -17,12 +17,14 @@ typedef unsigned __int64 uint64_t;
#include "../../config.h"
-#ifdef HAVE_STDINT_H
+#if defined(HAVE_STDINT_H)
#include <stdint.h>
-#else
-#ifdef HAVE_INTTYPES_H
+#elif defined(HAVE_INTTYPES_H)
#include <inttypes.h>
-#endif
+#elif defined(HAVE_SYS_INTTYPES_H)
+#include <sys/inttypes.h>
+#elif defined(HAVE_SYS_TYPES_H)
+#include <sys/types.h>
#endif
#endif