X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FNDBM_File%2FNDBM_File.xs;h=78a56cb7cce328a59d9fb37d5e360b5ee8ef97f3;hb=57aa3c4e03f4cbb463b4d524a054cc846d837648;hp=49a1db5e565709845eac6e9161be691e36c1daae;hpb=eb99164fe573f928a1e23c686cddfafdbe9ae10a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/NDBM_File/NDBM_File.xs b/ext/NDBM_File/NDBM_File.xs
index 49a1db5..78a56cb 100644
--- a/ext/NDBM_File/NDBM_File.xs
+++ b/ext/NDBM_File/NDBM_File.xs
@@ -1,6 +1,11 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
+/* If using the DB3 emulation, ENTER is defined both
+ * by DB3 and Perl.  We drop the Perl definition now.
+ * See also INSTALL section on DB3.
+ * -- Stanislav Brabec <utx@penguin.cz> */
+#undef ENTER
 #include <ndbm.h>
 
 typedef struct {
@@ -48,7 +53,7 @@ ndbm_TIEHASH(dbtype, filename, flags, mode)
 	    DBM * 	dbp ;
 
 	    RETVAL = NULL ;
-	    if (dbp =  dbm_open(filename, flags, mode)) {
+	    if ((dbp =  dbm_open(filename, flags, mode))) {
 	        RETVAL = (NDBM_File)safemalloc(sizeof(NDBM_File_type)) ;
     	        Zero(RETVAL, 1, NDBM_File_type) ;
 		RETVAL->dbp = dbp ;
@@ -102,7 +107,7 @@ ndbm_FIRSTKEY(db)
 datum_key
 ndbm_NEXTKEY(db, key)
 	NDBM_File	db
-	datum_key	key
+	datum_key	key = NO_INIT
 
 #define ndbm_error(db)				dbm_error(db->dbp)
 int