From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Fri, 25 Aug 2006 15:45:08 +0000 (+0000)
Subject: Following Jarkko's advice, it seems that ODBM_File cannot be
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2b9198b74d2a4d85eb2f4f75689dee7f3e19e146;p=p5sagit%2Fp5-mst-13.2.git

Following Jarkko's advice, it seems that ODBM_File cannot be
compiled as C++ as-is.

p4raw-id: //depot/perl@28757
---

diff --git a/ext/ODBM_File/ODBM_File.xs b/ext/ODBM_File/ODBM_File.xs
index 3504ff6..2510d5e 100644
--- a/ext/ODBM_File/ODBM_File.xs
+++ b/ext/ODBM_File/ODBM_File.xs
@@ -15,11 +15,7 @@ int	dbminit(char* filename);
 int	dbmclose(void);
 datum	fetch(datum key);
 int	store(datum key, datum dat);
-#  ifdef __cplusplus
-int	odelete(datum key);	/* Cannot be delete() for C++. */
-#  else
 int	delete(datum key); 
-#  endif
 datum	firstkey(void);
 datum	nextkey(datum key);
 #endif
@@ -57,11 +53,7 @@ typedef datum datum_value ;
 
 #define odbm_FETCH(db,key)			fetch(key)
 #define odbm_STORE(db,key,value,flags)		store(key,value)
-#ifdef __cplusplus
-#  define odbm_DELETE(db,key)			odelete(key)
-#else
-#  define odbm_DELETE(db,key)			delete(key)
-#endif
+#define odbm_DELETE(db,key)			delete(key)
 #define odbm_FIRSTKEY(db)			firstkey()
 #define odbm_NEXTKEY(db,key)			nextkey(key)