From 6da9bd485e8f0584b241a873a3b3b0696baa2a62 Mon Sep 17 00:00:00 2001 From: Zackery Spytz Date: Fri, 18 Jan 2019 23:48:46 -0700 Subject: [PATCH] [OCaml] Remove the last remnants of libswigocaml Parts of it were removed in 79785d403c80eb6c10b23668b07b106251373c1b Remove the oc_bool type. --- Lib/ocaml/extra-install.list | 1 - Lib/ocaml/libswigocaml.h | 20 -------------------- Lib/ocaml/typecheck.i | 2 +- Lib/ocaml/typemaps.i | 1 - 4 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 Lib/ocaml/libswigocaml.h diff --git a/Lib/ocaml/extra-install.list b/Lib/ocaml/extra-install.list index a63c7fc2f..16486eb2c 100644 --- a/Lib/ocaml/extra-install.list +++ b/Lib/ocaml/extra-install.list @@ -1,5 +1,4 @@ # see top-level Makefile.in -# libswigocaml is not needed anymore. swigp4.ml swig.mli swig.ml diff --git a/Lib/ocaml/libswigocaml.h b/Lib/ocaml/libswigocaml.h deleted file mode 100644 index e752540fe..000000000 --- a/Lib/ocaml/libswigocaml.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Ocaml runtime support */ - -#ifdef __cplusplus -extern "C" { -#endif - - typedef int oc_bool; - extern void *nullptr; - - extern oc_bool isnull( void *v ); - - extern void *get_char_ptr( char *str ); - extern void *make_ptr_array( int size ); - extern void *get_ptr( void *arrayptr, int elt ); - extern void set_ptr( void *arrayptr, int elt, void *elt_v ); - extern void *offset_ptr( void *ptr, int n ); - -#ifdef __cplusplus -}; -#endif diff --git a/Lib/ocaml/typecheck.i b/Lib/ocaml/typecheck.i index 9d95e2717..707302fff 100644 --- a/Lib/ocaml/typecheck.i +++ b/Lib/ocaml/typecheck.i @@ -78,7 +78,7 @@ } } -%typecheck(SWIG_TYPECHECK_BOOL) bool, oc_bool, const bool &, const oc_bool & { +%typecheck(SWIG_TYPECHECK_BOOL) bool, const bool & { if( !Is_block($input) ) $1 = 0; else { switch( SWIG_Tag_val($input) ) { diff --git a/Lib/ocaml/typemaps.i b/Lib/ocaml/typemaps.i index bf2ddfe85..2bf456a46 100644 --- a/Lib/ocaml/typemaps.i +++ b/Lib/ocaml/typemaps.i @@ -198,7 +198,6 @@ %enddef SIMPLE_MAP(bool, caml_val_bool, caml_long_val); -SIMPLE_MAP(oc_bool, caml_val_bool, caml_long_val); SIMPLE_MAP(char, caml_val_char, caml_long_val); SIMPLE_MAP(signed char, caml_val_char, caml_long_val); SIMPLE_MAP(unsigned char, caml_val_uchar, caml_long_val);