diff options
| author | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2008-05-05 16:55:12 +0000 |
|---|---|---|
| committer | Ion-Mihai Tetcu <itetcu@FreeBSD.org> | 2008-05-05 16:55:12 +0000 |
| commit | 90ce3c3996846d75572c92a2fc9a410bebbcb879 (patch) | |
| tree | 35da424904678f61ba5c474a4fdb1db06adbc726 /sysutils/vobcopy/files | |
| parent | 77bd3af976d14414baa86d0a7a35526f63605508 (diff) | |
Notes
Diffstat (limited to 'sysutils/vobcopy/files')
| -rw-r--r-- | sysutils/vobcopy/files/patch-vobcopy.h | 79 |
1 files changed, 22 insertions, 57 deletions
diff --git a/sysutils/vobcopy/files/patch-vobcopy.h b/sysutils/vobcopy/files/patch-vobcopy.h index b0d24cc2a166..ed98c43e3553 100644 --- a/sysutils/vobcopy/files/patch-vobcopy.h +++ b/sysutils/vobcopy/files/patch-vobcopy.h @@ -1,63 +1,28 @@ ---- vobcopy.h.orig Mon Nov 13 19:57:24 2006 -+++ vobcopy.h Mon Dec 4 23:57:12 2006 -@@ -19,7 +19,6 @@ - - #if ( defined( __unix__ ) || defined( unix )) && !defined( USG ) - #include <sys/param.h> --#else - #endif - - #if defined( __GNUC__ ) && \ -@@ -31,6 +30,8 @@ - /* by some bugreport:*/ - #if !( defined( BSD ) && ( BSD >= 199306 ) ) && !defined( sun ) - #include <stdint.h> -+#else -+#include <inttypes.h> - #endif - - /*for/from play_title.c*/ -@@ -66,24 +67,23 @@ +-- vobcopy.h.orig 2008-04-13 14:01:03.000000000 +0000 ++++ vobcopy.h 2008-04-13 14:08:18.000000000 +0000 +@@ -58,7 +58,7 @@ /* ////////// *BSD ////////// */ #if ( defined( BSD ) && ( BSD >= 199306 ) ) - + -# if !defined( __NetBSD__ ) ) || \ -- ( defined( __NetBSD__) && ( __NetBSD_Version__ < 200040000 ) ) --#include <sys/mount.h> --#define USE_STATFS 1 -+# if ( defined( __NetBSD__) && ( __NetBSD_Version__ < 200040000 ) ) || \ -+ ( defined( __FreeBSD__) && ( __FreeBSD_version >= 500040 ) ) ++# if ! ( defined( __NetBSD__ ) ) || \ + ( defined( __NetBSD__) && ( __NetBSD_Version__ < 200040000 ) ) + #include <sys/mount.h> + #define USE_STATFS 1 +@@ -87,12 +87,13 @@ + #define GETMNTINFO_USES_STATVFS + + # endif ++# endif + +-# else +- ++#if defined(__FreeBSD__) +#include <sys/statvfs.h> - - # else - --#include <sys/statvfs.h> -+#include <sys/mount.h> -+#define USE_STATFS 1 - - # endif - --# if defined(NetBSD) ++#else + #include <sys/vfs.h> - --#include <sys/param.h> -+# if defined(__NetBSD__) || defined(__FreeBSD__) - - #define USE_GETMNTINFO - --# if ( __NetBSD_Version__ < 200040000 ) -+# if (defined( __NetBSD__ ) && ( __NetBSD_Version__ < 200040000 )) || \ -+ (defined( __FreeBSD__ )) - - #include <sys/mount.h> - #define USE_STATFS_FOR_DEV -@@ -170,7 +170,10 @@ - - #include "dvd.h" - -+/* BSD already have off_t definition */ -+#if !(defined(BSD) && (BSD >= 199306)) - #define off_t __off64_t +-# endif +#endif - - void usage(char *); - int add_end_slash( char * ); + + #define HAS_LARGEFILE 1 |