From: rich Date: Wed, 3 Nov 2004 14:15:16 +0000 (+0000) Subject: Patch by David Flynn X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=12c06e82e99722ba478d9d9c10eea78397d649c7;p=perl4caml.git Patch by David Flynn --- diff --git a/Makefile b/Makefile index 61ec162..1560e4e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # Interface to Perl from OCaml. # Copyright (C) 2003 Merjis Ltd. -# $Id: Makefile,v 1.20 2004-02-13 10:37:16 rich Exp $ +# $Id: Makefile,v 1.21 2004-11-03 14:15:16 rich Exp $ include Makefile.config @@ -26,7 +26,7 @@ SED := sed # XXX Hack required by ocamlopt, and sometimes ocamlc. # To work out what this should be, try: # `perl -MExtUtils::Embed -e ldopts' -DYNALOADER_HACK := /usr/lib/perl/5.8.2/auto/DynaLoader/DynaLoader.a +DYNALOADER_HACK := /usr/lib/perl/5.8/auto/DynaLoader/DynaLoader.a OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS) diff --git a/Makefile.config b/Makefile.config index e447d63..4d70d9e 100644 --- a/Makefile.config +++ b/Makefile.config @@ -1,5 +1,5 @@ # perl4caml configuration -*- Makefile -*- -# $Id: Makefile.config,v 1.15 2004-03-25 13:45:43 rich Exp $ +# $Id: Makefile.config,v 1.16 2004-11-03 14:15:18 rich Exp $ # PERLINCDIR # Directory containing the Perl include files, eg. . @@ -32,4 +32,4 @@ EXTRA_CFLAGS := # PACKAGE and VERSION PACKAGE := perl4caml -VERSION := 0.3.10 +VERSION := 0.3.11 diff --git a/perl_c.c b/perl_c.c index 20d4299..f11a2b5 100644 --- a/perl_c.c +++ b/perl_c.c @@ -1,6 +1,6 @@ /* Interface to Perl from OCaml. * Copyright (C) 2003 Merjis Ltd. - * $Id: perl_c.c,v 1.15 2004-03-03 12:39:20 rich Exp $ + * $Id: perl_c.c,v 1.16 2004-11-03 14:15:18 rich Exp $ */ #include @@ -233,7 +233,7 @@ perl4caml_deref (value svv) CAMLlocal1 (rsvv); SV *sv = Sv_val (svv); - if (SvROK (sv)) + if (!SvROK (sv)) invalid_argument ("deref: SV is not a reference"); switch (SvTYPE (SvRV (sv))) { case SVt_IV: @@ -256,7 +256,7 @@ perl4caml_deref_array (value svv) CAMLlocal1 (ravv); SV *sv = Sv_val (svv); - if (SvROK (sv)) + if (!SvROK (sv)) invalid_argument ("deref_array: SV is not a reference"); switch (SvTYPE (SvRV (sv))) { case SVt_PVAV: @@ -275,7 +275,7 @@ perl4caml_deref_hash (value svv) CAMLlocal1 (rhvv); SV *sv = Sv_val (svv); - if (SvROK (sv)) + if (!SvROK (sv)) invalid_argument ("deref_hash: SV is not a reference"); switch (SvTYPE (SvRV (sv))) { case SVt_PVHV: