Replace unconditional #defines by build system trickery.

This reduces our local diff considerably.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16715 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 72 insertions, 111 deletions

diff --git a/libmpdvdkit2/Makefile b/libmpdvdkit2/Makefile
index 66918b36ef..ec5435e7c6 100644
--- a/libmpdvdkit2/Makefile
+++ b/libmpdvdkit2/Makefile
@@ -36,7 +36,12 @@ endif
 # -funroll-loops  removed, triggered gcc 3.0.4 (3.x?) bug
 CFLAGS= -I. $(OPTFLAGS) $(EXTRA_INC)\
 	-DSYS_LINUX -D__USE_UNIX98 -D_REENTRANT -D_GNU_SOURCE \
-	-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS
+	-DHAVE_DVDCSS_DVDCSS_H -DSTDC_HEADERS -DHAVE_LIMITS_H \
+	-DHAVE_ERRNO_H -DHAVE_INTTYPES_H -DHAVE_UNISTD_H \
+
+ifeq ($(TARGET_OS),CYGWIN)
+CFLAGS+=-DSYS_CYGWIN
+endif
 
 .c.o:
 	$(CC) $(CFLAGS) -c -o $@ $<
diff --git a/libmpdvdkit2/common.h b/libmpdvdkit2/common.h
index 6d292e4590..534b0e514d 100644
--- a/libmpdvdkit2/common.h
+++ b/libmpdvdkit2/common.h
@@ -3,9 +3,6 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- *
- * Modified for use with MPlayer, changes contained in libdvdcss_changes.diff.
- * detailed CVS changelog at http://www.mplayerhq.hu/cgi-bin/cvsweb.cgi/main/
  * $Id$
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -30,10 +27,21 @@
 /*****************************************************************************
  * Basic types definitions
  *****************************************************************************/
-#include <inttypes.h>
-
-#ifdef __CYGWIN__
-#define SYS_CYGWIN
+#if defined( HAVE_STDINT_H )
+#   include <stdint.h>
+#elif defined( HAVE_INTTYPES_H )
+#   include <inttypes.h>
+#elif defined( SYS_CYGWIN )
+#   include <sys/types.h>
+    /* Cygwin only defines half of these... */
+    typedef u_int8_t            uint8_t;
+    typedef u_int32_t           uint32_t;
+#else
+    /* Fallback types (very x86-centric, sorry) */
+    typedef unsigned char       uint8_t;
+    typedef signed char         int8_t;
+    typedef unsigned int        uint32_t;
+    typedef signed int          int32_t;
 #endif
 
 #if defined( WIN32 )
diff --git a/libmpdvdkit2/css.c b/libmpdvdkit2/css.c
index ba87c09ec8..2899bebacb 100644
--- a/libmpdvdkit2/css.c
+++ b/libmpdvdkit2/css.c
@@ -44,9 +44,17 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #   include <unistd.h>
+#endif
 #include <fcntl.h>
+
+#ifdef HAVE_LIMITS_H
 #   include <limits.h>
+#endif
 
 #include "dvdcss.h"
 
diff --git a/libmpdvdkit2/device.c b/libmpdvdkit2/device.c
index d2853e36a2..7ffa2653e4 100644
--- a/libmpdvdkit2/device.c
+++ b/libmpdvdkit2/device.c
@@ -34,12 +34,23 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_ERRNO_H
 #   include <errno.h>
+#endif
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#endif
 #include <fcntl.h>
+
+#ifdef HAVE_UNISTD_H
 #   include <unistd.h>
+#endif
+
+#ifdef HAVE_LIMITS_H
 #   include <limits.h>
+#endif
 
 #if defined( WIN32 ) && !defined( SYS_CYGWIN )
 #   include <io.h>                                                 /* read() */
diff --git a/libmpdvdkit2/error.c b/libmpdvdkit2/error.c
index e30e18e445..49d989da0b 100644
--- a/libmpdvdkit2/error.c
+++ b/libmpdvdkit2/error.c
@@ -28,7 +28,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+
+#ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#endif
+
+#ifdef HAVE_LIMITS_H
 #   include <limits.h>
+#endif
 
 #include "dvdcss.h"
 
diff --git a/libmpdvdkit2/libdvdcss.c b/libmpdvdkit2/libdvdcss.c
index 16c8563eca..71bc7d2b98 100644
--- a/libmpdvdkit2/libdvdcss.c
+++ b/libmpdvdkit2/libdvdcss.c
@@ -103,10 +103,26 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#endif
+#ifdef HAVE_PWD_H
+#   include <pwd.h>
+#endif
 #include <fcntl.h>
 #include <errno.h>
+
+#ifdef HAVE_UNISTD_H
 #   include <unistd.h>
+#endif
+
+#ifdef HAVE_LIMITS_H
 #   include <limits.h>
+#endif
+
+#ifdef HAVE_DIRECT_H
+#   include <direct.h>
+#endif
 
 #include "dvdcss.h"
 
diff --git a/libmpdvdkit2/libdvdcss_changes.diff b/libmpdvdkit2/libdvdcss_changes.diff
index babed5f415..4789a873eb 100644
--- a/libmpdvdkit2/libdvdcss_changes.diff
+++ b/libmpdvdkit2/libdvdcss_changes.diff
@@ -1,48 +1,8 @@
---- common.h	2003-06-13 19:33:35.000000000 +0200
-+++ common.h	2005-03-01 07:41:41.000000000 +0100
-@@ -27,21 +27,10 @@
- /*****************************************************************************
-  * Basic types definitions
-  *****************************************************************************/
--#if defined( HAVE_STDINT_H )
--#   include <stdint.h>
--#elif defined( HAVE_INTTYPES_H )
--#   include <inttypes.h>
--#elif defined( SYS_CYGWIN )
--#   include <sys/types.h>
--    /* Cygwin only defines half of these... */
--    typedef u_int8_t            uint8_t;
--    typedef u_int32_t           uint32_t;
--#else
--    /* Fallback types (very x86-centric, sorry) */
--    typedef unsigned char       uint8_t;
--    typedef signed char         int8_t;
--    typedef unsigned int        uint32_t;
--    typedef signed int          int32_t;
-+#include <inttypes.h>
-+
-+#ifdef __CYGWIN__
-+#define SYS_CYGWIN
- #endif
- 
- #if defined( WIN32 )
 --- css.c	2005-07-11 14:24:09.000000000 +0200
-+++ css.c	2005-10-01 19:02:35.000000000 +0200
-@@ -41,19 +41,11 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#ifdef HAVE_SYS_PARAM_H
--#   include <sys/param.h>
--#endif
--#ifdef HAVE_UNISTD_H
- #   include <unistd.h>
--#endif
- #include <fcntl.h>
--
--#ifdef HAVE_LIMITS_H
++++ css.c	2005-10-01 20:14:37.000000000 +0200
+@@ -53,7 +56,7 @@
  #   include <limits.h>
--#endif
+ #endif
  
 -#include "dvdcss/dvdcss.h"
 +#include "dvdcss.h"
@@ -51,30 +11,6 @@
  #include "css.h"
 --- device.c	2005-07-11 13:33:34.000000000 +0200
 +++ device.c	2005-10-01 19:08:07.000000000 +0200
-@@ -31,23 +31,12 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#ifdef HAVE_ERRNO_H
- #   include <errno.h>
--#endif
- #include <sys/types.h>
- #include <sys/stat.h>
--#ifdef HAVE_SYS_PARAM_H
--#   include <sys/param.h>
--#endif
- #include <fcntl.h>
--
--#ifdef HAVE_UNISTD_H
- #   include <unistd.h>
--#endif
--
--#ifdef HAVE_LIMITS_H
- #   include <limits.h>
--#endif
- 
- #if defined( WIN32 ) && !defined( SYS_CYGWIN )
- #   include <io.h>                                                 /* read() */
 @@ -55,7 +44,7 @@
  #   include <sys/uio.h>                                      /* struct iovec */
  #endif
@@ -99,19 +35,10 @@
      /* Initialize readv temporary buffer */
      dvdcss->p_readv_buffer   = NULL;
 --- error.c	2004-02-24 16:46:49.000000000 +0100
-+++ error.c	2005-10-01 19:10:06.000000000 +0200
-@@ -25,16 +25,9 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--
--#ifdef HAVE_SYS_PARAM_H
--#   include <sys/param.h>
--#endif
--
--#ifdef HAVE_LIMITS_H
++++ error.c	2005-10-01 20:15:46.000000000 +0200
+@@ -34,7 +37,7 @@
  #   include <limits.h>
--#endif
+ #endif
  
 -#include "dvdcss/dvdcss.h"
 +#include "dvdcss.h"
@@ -132,31 +59,10 @@
   */
  
  /*
-@@ -103,28 +100,12 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
--#ifdef HAVE_SYS_PARAM_H
--#   include <sys/param.h>
--#endif
--#ifdef HAVE_PWD_H
--#   include <pwd.h>
--#endif
- #include <fcntl.h>
- #include <errno.h>
--
--#ifdef HAVE_UNISTD_H
- #   include <unistd.h>
--#endif
--
--#ifdef HAVE_LIMITS_H
- #   include <limits.h>
--#endif
+@@ -124,7 +127,7 @@
+ #   include <direct.h>
+ #endif
  
--#ifdef HAVE_DIRECT_H
--#   include <direct.h>
--#endif
--
 -#include "dvdcss/dvdcss.h"
 +#include "dvdcss.h"