[cairo-commit] cairo-ocaml/src ml_cairo.c, 1.26, 1.27 cairo.mli, 1.21, 1.22 cairo.ml, 1.19, 1.20

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml/src
In directory gabe:/tmp/cvs-serv19153/src

Modified Files:
	ml_cairo.c cairo.mli cairo.ml 
Log Message:
* configure.ac: require cairo 1.0, bump version number to 1.0
* src/cairo.ml, src/cairo.mli, src/ml_cairo.c: version information
  APIs


Index: ml_cairo.c
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/ml_cairo.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ml_cairo.c	3 Nov 2005 14:35:57 -0000	1.26
+++ ml_cairo.c	3 Nov 2005 14:47:03 -0000	1.27
@@ -8,6 +8,27 @@
 
 #include "ml_cairo.h"
 
+wML_0(cairo_version_string, caml_copy_string)
+wML_0(cairo_version, Val_int)
+
+CAMLprim value
+ml_CAIRO_VERSION_STRING (value unit)
+{
+  return caml_copy_string (CAIRO_VERSION_STRING);
+}
+
+CAMLprim value
+ml_CAIRO_VERSION (value unit)
+{
+  return Val_int (CAIRO_VERSION);
+}
+
+CAMLprim value
+ml_CAIRO_VERSION_ENCODE (value maj, value min, value mic)
+{
+  return Val_int (CAIRO_VERSION_ENCODE (Int_val(maj), Int_val(min), Int_val(mic)));
+}
+
 wMake_Val_final_pointer(cairo_t, cairo_destroy, 0)
 
 CAMLprim value

Index: cairo.mli
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/cairo.mli,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- cairo.mli	11 Aug 2005 00:33:04 -0000	1.21
+++ cairo.mli	3 Nov 2005 14:47:03 -0000	1.22
@@ -30,9 +30,18 @@
   | INVALID_FORMAT
   | INVALID_VISUAL
   | FILE_NOT_FOUND
+  | INVALID_DASH
 exception Error of status
 val init : unit
 
+external version_encode : int -> int -> int -> int = "ml_CAIRO_VERSION_ENCODE"
+
+external run_time_version        : unit -> int    = "ml_cairo_version"
+external run_time_version_string : unit -> string = "ml_cairo_version_string"
+
+val compile_time_version        : int
+val compile_time_version_string : string
+
 (** {3 Types} *)
 
 type t

Index: cairo.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/src/cairo.ml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- cairo.ml	11 Aug 2005 00:33:04 -0000	1.19
+++ cairo.ml	3 Nov 2005 14:47:03 -0000	1.20
@@ -26,9 +26,18 @@
   | INVALID_FORMAT
   | INVALID_VISUAL
   | FILE_NOT_FOUND
+  | INVALID_DASH
 exception Error of status
 let init = Callback.register_exception "cairo_status_exn" (Error NULL_POINTER)
 
+external version_encode : int -> int -> int -> int = "ml_CAIRO_VERSION_ENCODE"
+external run_time_version        : unit -> int = "ml_cairo_version"
+external run_time_version_string : unit -> string = "ml_cairo_version_string"
+external _version        : unit -> int = "ml_CAIRO_VERSION"
+external _version_string : unit -> string = "ml_CAIRO_VERSION_STRING"
+let compile_time_version = _version ()
+let compile_time_version_string = _version_string ()
+
 type t
 type -'a surface
 type -'a pattern