Mercurial > mplayer.hg
changeset 24011:aa0a5aa712fc
Move some #defines into configure/config.h.
| author | diego |
|---|---|
| date | Wed, 08 Aug 2007 09:12:33 +0000 |
| parents | 06bb7bca1a10 |
| children | 94d4930701b4 |
| files | configure libdvdcss/Makefile libfaad2/common.h libfaad2/local_changes.diff |
| diffstat | 4 files changed, 14 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Aug 08 08:59:59 2007 +0000 +++ b/configure Wed Aug 08 09:12:33 2007 +0000 @@ -7680,6 +7680,18 @@ /* int_fastXY_t emulation */ $_def_fast_inttypes +/* libdvdcss */ +#define HAVE_ERRNO_H 1 +#define HAVE_LIMITS_H 1 + +/* libdvdcss + libfaad2 */ +#define HAVE_UNISTD_H 1 + +/* libfaad2 */ +#define STDC_HEADERS 1 +#define HAVE_MEMCPY 1 +#define HAVE_STRCHR 1 + /* use GNU internationalization */ $_def_i18n
--- a/libdvdcss/Makefile Wed Aug 08 08:59:59 2007 +0000 +++ b/libdvdcss/Makefile Wed Aug 08 09:12:33 2007 +0000 @@ -9,7 +9,6 @@ libdvdcss.c \ #bsdi_ioctl \ -CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" \ - -DHAVE_LIMITS_H -DHAVE_ERRNO_H -DHAVE_UNISTD_H +CFLAGS = -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" include ../mpcommon.mak
--- a/libfaad2/common.h Wed Aug 08 08:59:59 2007 +0000 +++ b/libfaad2/common.h Wed Aug 08 09:12:33 2007 +0000 @@ -178,15 +178,6 @@ #else -/* Define if you have the `memcpy' function. */ -#define HAVE_MEMCPY 1 - -/* Define if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - #include <stdio.h> #if HAVE_SYS_TYPES_H # include <sys/types.h>
--- a/libfaad2/local_changes.diff Wed Aug 08 08:59:59 2007 +0000 +++ b/libfaad2/local_changes.diff Wed Aug 08 09:12:33 2007 +0000 @@ -76,7 +76,7 @@ typedef unsigned __int64 uint64_t; typedef unsigned __int32 uint32_t; typedef unsigned __int16 uint16_t; -@@ -159,11 +169,24 @@ +@@ -159,5 +169,9 @@ typedef __int32 int32_t; typedef __int16 int16_t; typedef __int8 int8_t; @@ -86,21 +86,6 @@ + typedef float float32_t; - - #else - -+/* Define if you have the `memcpy' function. */ -+#define HAVE_MEMCPY 1 -+ -+/* Define if you have the `strchr' function. */ -+#define HAVE_STRCHR 1 -+ -+/* Define if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ - #include <stdio.h> - #if HAVE_SYS_TYPES_H - # include <sys/types.h> @@ -289,7 +319,7 @@ }