77 lines
1.7 KiB
Plaintext
77 lines
1.7 KiB
Plaintext
--- acinclude.m4
|
|
+++ acinclude.m4 Tue Jul 1 16:50:38 2003
|
|
@@ -124,11 +124,7 @@
|
|
[#if HAVE_STDINT_H
|
|
#include <stdint.h>
|
|
#endif
|
|
-#include <sys/types.h>
|
|
-#ifdef STDC_HEADERS
|
|
-#include <stdlib.h>
|
|
-#endif
|
|
-])
|
|
+$ac_includes_default])
|
|
])
|
|
|
|
|
|
--- configure.in
|
|
+++ configure.in Tue Jul 1 16:51:52 2003
|
|
@@ -81,12 +81,14 @@
|
|
AC_CHECK_TYPE_STDC(int32_t, int)
|
|
AC_C_LONG_LONG
|
|
if test $ac_cv_c_long_long = yes; then
|
|
- long64='unsigned long long';
|
|
+dnl long64='unsigned long long';
|
|
+ AC_CHECK_TYPE(uint64_t, unsigned long long)
|
|
else
|
|
- long64='unsigned long';
|
|
+dnl long64='unsigned long';
|
|
+ AC_CHECK_TYPE(uint64_t, unsigned long)
|
|
fi
|
|
dnl This needs a patch to autoconf 2.13 acgeneral.m4
|
|
-AC_CHECK_TYPE2_STDC(uint64_t, $long64)
|
|
+dnl AC_CHECK_TYPE2_STDC(uint64_t, $long64)
|
|
|
|
AC_CHECK_SIZEOF_STDC_HEADERS(uint8_t, 0)
|
|
AC_CHECK_SIZEOF_STDC_HEADERS(uint16_t, 0)
|
|
--- doc/Makefile.am
|
|
+++ doc/Makefile.am Mon Dec 15 13:04:19 2003
|
|
@@ -5,7 +5,8 @@
|
|
man_MAGIC = magic.4
|
|
endif
|
|
fsect = @fsect@
|
|
-man_MANS = file.1 $(man_MAGIC) libmagic.3
|
|
+#man_MANS = file.1 $(man_MAGIC) libmagic.3
|
|
+man_MANS = file.1 magic.5 libmagic.3
|
|
|
|
EXTRA_DIST = file.man magic.man libmagic.man
|
|
CLEANFILES = $(man_MANS)
|
|
@@ -17,7 +18,8 @@
|
|
-e s@__VERSION__@${VERSION}@g \
|
|
-e s@__MAGIC__@${MAGIC}@g $(srcdir)/file.man > $@
|
|
|
|
-magic.${fsect}: Makefile magic.man
|
|
+#magic.${fsect}: Makefile magic.man
|
|
+magic.5: Makefile magic.man
|
|
@rm -f $@
|
|
sed -e s@__CSECTION__@1@g \
|
|
-e s@__FSECTION__@${fsect}@g \
|
|
--- src/readelf.h
|
|
+++ src/readelf.h Tue Jul 1 16:53:55 2003
|
|
@@ -36,7 +36,10 @@
|
|
#ifndef __fake_elf_h__
|
|
#define __fake_elf_h__
|
|
|
|
+#include <features.h>
|
|
+
|
|
#if HAVE_STDINT_H
|
|
+__BEGIN_DECLS
|
|
#include <stdint.h>
|
|
#endif
|
|
|
|
@@ -233,4 +236,5 @@
|
|
#define GNU_OS_HURD 1
|
|
#define GNU_OS_SOLARIS 2
|
|
|
|
+__END_DECLS
|
|
#endif
|