summaryrefslogtreecommitdiffstats
path: root/archive/lzop/lzo2.diff
diff options
context:
space:
mode:
Diffstat (limited to 'archive/lzop/lzo2.diff')
-rw-r--r--archive/lzop/lzo2.diff104
1 files changed, 104 insertions, 0 deletions
diff --git a/archive/lzop/lzo2.diff b/archive/lzop/lzo2.diff
new file mode 100644
index 0000000000..d04dffda53
--- /dev/null
+++ b/archive/lzop/lzo2.diff
@@ -0,0 +1,104 @@
+diff -purN lzop-1.01/configure lzop/configure
+--- lzop-1.01/configure 2003-04-27 18:00:02.000000000 -0400
++++ lzop/configure 2005-06-07 14:13:23.000000000 -0400
+@@ -4078,9 +4078,9 @@ done
+
+
+
+-echo "$as_me:$LINENO: checking for __lzo_init2 in -llzo" >&5
+-echo $ECHO_N "checking for __lzo_init2 in -llzo... $ECHO_C" >&6
+-if test "${ac_cv_lib_lzo___lzo_init2+set}" = set; then
++echo "$as_me:$LINENO: checking for __lzo_init_v2 in -llzo" >&5
++echo $ECHO_N "checking for __lzo_init_v2 in -llzo... $ECHO_C" >&6
++if test "${ac_cv_lib_lzo___lzo_init_v2+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -4099,11 +4099,11 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+-char __lzo_init2 ();
++char __lzo_init_v2 ();
+ int
+ main ()
+ {
+-__lzo_init2 ();
++__lzo_init_v2 ();
+ ;
+ return 0;
+ }
+@@ -4120,19 +4120,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+- ac_cv_lib_lzo___lzo_init2=yes
++ ac_cv_lib_lzo___lzo_init_v2=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_cv_lib_lzo___lzo_init2=no
++ac_cv_lib_lzo___lzo_init_v2=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_lzo___lzo_init2" >&5
+-echo "${ECHO_T}$ac_cv_lib_lzo___lzo_init2" >&6
+-if test $ac_cv_lib_lzo___lzo_init2 = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_lzo___lzo_init_v2" >&5
++echo "${ECHO_T}$ac_cv_lib_lzo___lzo_init_v2" >&6
++if test $ac_cv_lib_lzo___lzo_init_v2 = yes; then
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBLZO 1
+ _ACEOF
+diff -purN lzop-1.01/src/conf.h lzop/src/conf.h
+--- lzop-1.01/src/conf.h 2003-04-27 18:00:02.000000000 -0400
++++ lzop/src/conf.h 2005-06-07 14:23:56.000000000 -0400
+@@ -68,22 +68,6 @@
+ //
+ **************************************************************************/
+
+-#undef USE_MALLOC
+-#if defined(WITH_LZO)
+-# define USE_MALLOC
+-# undef malloc
+-# undef free
+-# define malloc lzo_malloc
+-# define free lzo_free
+-#else
+-# error
+-#endif
+-
+-
+-/*************************************************************************
+-//
+-**************************************************************************/
+-
+ #if defined(ACC_OS_EMX)
+ # define DOSISH
+ # define F_OS (_osmode == 0 ? F_OS_FAT : F_OS_OS2)
+@@ -236,22 +220,6 @@ typedef RETSIGTYPE (SIGTYPEENTRY *sig_ty
+ #endif
+
+
+-#if defined(NO_MEMCMP)
+-# undef HAVE_MEMCMP
+-#endif
+-#if !defined(HAVE_MEMCMP)
+-# undef memcmp
+-# define memcmp lzo_memcmp
+-#endif
+-#if !defined(HAVE_MEMCPY)
+-# undef memcpy
+-# define memcpy lzo_memcpy
+-#endif
+-#if !defined(HAVE_MEMSET)
+-# undef memset
+-# define memset lzo_memset
+-#endif
+-
+ #if !defined(HAVE_STRCASECMP)
+ # if defined(HAVE_STRICMP)
+ # define strcasecmp stricmp