diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-10-08 15:41:28 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-10-08 15:41:28 +0000 |
| commit | 53b3371fe3a741670e791260bf39e94c016f1edf (patch) | |
| tree | 61099c2331c4eb089beb2e5a565e68973bd8d2f3 /src/libfaad/diff_to_faad2_cvs.patch | |
| parent | c04370672e40a27dae54d36ae574014f846e846a (diff) | |
| download | xine-lib-53b3371fe3a741670e791260bf39e94c016f1edf.tar.gz xine-lib-53b3371fe3a741670e791260bf39e94c016f1edf.tar.bz2 | |
unify the two patches for the same file into one
CVS patchset: 7015
CVS date: 2004/10/08 15:41:28
Diffstat (limited to 'src/libfaad/diff_to_faad2_cvs.patch')
| -rw-r--r-- | src/libfaad/diff_to_faad2_cvs.patch | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/libfaad/diff_to_faad2_cvs.patch b/src/libfaad/diff_to_faad2_cvs.patch index df7a6db7b..c32825f3b 100644 --- a/src/libfaad/diff_to_faad2_cvs.patch +++ b/src/libfaad/diff_to_faad2_cvs.patch @@ -1,21 +1,3 @@ ---- common.h.old 2004-01-10 22:45:44.000000000 +0100 -+++ common.h 2004-01-10 22:46:20.000000000 +0100 -@@ -290,6 +290,7 @@ - } - - -+#ifndef HAVE_LRINTF - #ifdef _WIN32 - #define HAS_LRINTF - static INLINE int lrintf(float f) -@@ -316,6 +317,7 @@ - return i; - } - #endif -+#endif - - - #ifdef __ICL /* only Intel C compiler has fmath ??? */ diff -u -p -r1.1.1.1 common.h --- common.h 26 Jul 2004 15:27:56 -0000 1.1.1.1 +++ common.h 30 Jul 2004 00:08:55 -0000 @@ -86,6 +68,22 @@ diff -u -p -r1.1.1.1 common.h #endif #ifdef WORDS_BIGENDIAN +@@ -292,6 +290,7 @@ + } + + ++#ifndef HAVE_LRINTF + #ifdef _WIN32 + #define HAS_LRINTF + static INLINE int lrintf(float f) +@@ -318,6 +317,7 @@ + return i; + } + #endif ++#endif + + + #ifdef __ICL /* only Intel C compiler has fmath ??? */ diff -u -p -r1.1.1.1 bits.h --- bits.h 26 Jul 2004 15:27:56 -0000 1.1.1.1 +++ bits.h 30 Jul 2004 09:35:55 -0000 |