Markus Mottl avatar Markus Mottl committed ec6cbe5

Fixed a Windows portability bug in the C-bindings

Comments (0)

Files changed (4)

+2011-12-15:  Fixed a Windows portability bug in the C-bindings.
+
+             Thanks to Evgenii Lepikhin <johnlepikhin@gmail.com> for the patch!
+
 2011-11-09:  Updated OCamlMakefile to fix linking order.
 
 2011-01-16:  Added support for limit recursion flag.
 name="pcre"
-version="6.2.1"
+version="6.2.4"
 description="Perl Compatibility Regular Expressions"
 requires=""
 archive(byte)="pcre.cma"

lib/Makefile.win32

 	ocamlopt -verbose -a -o pcre.cmxa pcre.cmx \
   		-cclib pcre_stubs.lib -cclib libpcre.lib 
 
-install:
+install: pcre.cmxa pcre.cma
 	ocamlfind install pcre META pcre.cma pcre.cmxa pcre.cmi pcre.mli \
 		pcre.lib pcre_stubs.lib
 uninstall:
       if (ret < 0) handle_exec_error("pcre_exec_stub", ret);
       else {
         const int *ovec_src = ovec + subgroups2_1;
+#if _WIN64
+        long long *ovec_dst = (long long *) ovec + subgroups2_1;
+#else
         long int *ovec_dst = (long int *) ovec + subgroups2_1;
+#endif
 
         /* Converts offsets from C-integers to OCaml-Integers
            This is a bit tricky, because there are 32- and 64-bit platforms
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.