[Pkg-ocaml-maint-commits] r1499 - trunk/packages/camlgz/trunk/debian/patches

[Thomas Petazzoni]

Author: tpetazzo-guest
Date: 2005-07-28 22:26:42 +0000 (Thu, 28 Jul 2005)
New Revision: 1499

Modified:
   trunk/packages/camlgz/trunk/debian/patches/fix-lvalue-compil.dpatch
Log:
More compilation fixes. It works now.

Modified: trunk/packages/camlgz/trunk/debian/patches/fix-lvalue-compil.dpatch
===================================================================
--- trunk/packages/camlgz/trunk/debian/patches/fix-lvalue-compil.dpatch	2005-07-28 22:09:47 UTC (rev 1498)
+++ trunk/packages/camlgz/trunk/debian/patches/fix-lvalue-compil.dpatch	2005-07-28 22:26:42 UTC (rev 1499)
@@ -5,38 +5,44 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad camlgz-0.5.6/c_bz.c /tmp/dpep.pzdIuk/camlgz-0.5.6/c_bz.c
+diff -urNad camlgz-0.5.6/c_bz.c /tmp/dpep.GsKTqc/camlgz-0.5.6/c_bz.c
 --- camlgz-0.5.6/c_bz.c	2002-05-29 10:47:57.000000000 +0200
-+++ /tmp/dpep.pzdIuk/camlgz-0.5.6/c_bz.c	2005-07-29 00:02:25.000000000 +0200
-@@ -68,6 +68,7 @@
++++ /tmp/dpep.GsKTqc/camlgz-0.5.6/c_bz.c	2005-07-29 00:13:10.000000000 +0200
+@@ -67,7 +67,9 @@
+ }
  
  #define Cfile_val(v)  ((FILE*)(Field((v), 0)))
++#define lCfile_val(v)  ((Field((v), 0)))
  #define Bzfile_val(v) ((BZFILE*)(Field((v), 1)))
 +#define lBzfile_val(v) ((Field((v), 1)))
  #define Bz_eof(v)     (Bool_val(Field((v), 2)))
  
  static void set_eof_flag(value chan)
-@@ -142,7 +143,7 @@
+@@ -141,8 +143,8 @@
+   int bzerror ;
    BZ_P(bzReadClose)(&bzerror, Bzfile_val(chan)) ;
    fclose(Cfile_val(chan)) ;
-   Cfile_val(chan) = NULL;
+-  Cfile_val(chan) = NULL;
 -  Bzfile_val(chan) = NULL;
++  lCfile_val(chan) = NULL;
 +  lBzfile_val(chan) = NULL;
    /*  mlbz_error(bzerror, "Bz.close_in", chan, 1); */
    return Val_unit ;
  }
-@@ -198,7 +199,7 @@
+@@ -197,8 +199,8 @@
+   int bzerror ;
    BZ_P(bzWriteClose)(&bzerror, Bzfile_val(chan), 0, NULL, NULL) ;
    fclose(Cfile_val(chan)) ;
-   Cfile_val(chan) = NULL;
+-  Cfile_val(chan) = NULL;
 -  Bzfile_val(chan) = NULL;
++  lCfile_val(chan) = NULL;
 +  lBzfile_val(chan) = NULL;
    /*  mlbz_error(bzerror, "Bz.close_out", chan, 0); */
    return Val_unit ;
  }
-diff -urNad camlgz-0.5.6/c_gz.c /tmp/dpep.pzdIuk/camlgz-0.5.6/c_gz.c
+diff -urNad camlgz-0.5.6/c_gz.c /tmp/dpep.GsKTqc/camlgz-0.5.6/c_gz.c
 --- camlgz-0.5.6/c_gz.c	2002-05-29 10:41:35.000000000 +0200
-+++ /tmp/dpep.pzdIuk/camlgz-0.5.6/c_gz.c	2005-07-29 00:01:51.000000000 +0200
++++ /tmp/dpep.GsKTqc/camlgz-0.5.6/c_gz.c	2005-07-29 00:12:23.000000000 +0200
 @@ -65,6 +65,7 @@
  
  /* extract the gzFile from the Caml value */