Commits

camlspotter committed 44db864 Merge

merge

  • Participants
  • Parent commits caaf9f7, ab1765d
  • Branches 4.1.1

Comments (0)

Files changed (4)

opam/camlimages.4.1.1/opam

 depends: ["ocamlfind" "base-unix" "omake"]
 depopts: ["lablgtk"]
 
-homepage: "http://cristal.inria.fr/camlimages/"
+homepage: "https://bitbucket.org/camlspotter/camlimages"
 license: "LGPL-2 with OCaml linking exception"
 authors: [
   "Jun Furuse"

opam/camlimages.4.1.1/url

-archive: "https://bitbucket.org/camlspotter/camlimages/get/4.1.0.tar.gz"
+archive: "https://bitbucket.org/camlspotter/camlimages/get/4.1.1.tar.gz"
 
 #include "oversized.h"
 
-/* These are defined in caml/config.h */
+/* These are defined both in caml/config.h and in tiff.h */
 #undef int16
 #undef uint16
 #undef int32
 #undef uint32
-#define int16 int16tiff
-#define uint16 uint16tiff
-#define int32 int32tiff
-#define uint32 uint32tiff
+#undef int64
+#undef uint64
 
 #include <tiffio.h>
 
 #include <caml/memory.h>
 #include <caml/fail.h>
 
-/* These are defined in caml/config.h */
+/* These are defined both in caml/config.h and in tiff.h */
 #undef int16
 #undef uint16
 #undef int32
 #undef uint32
-#define int16 int16tiff
-#define uint16 uint16tiff
-#define int32 int32tiff
-#define uint32 uint32tiff
+#undef int64
+#undef uint64
 
 #include <tiffio.h>