--- a/src/database.c	Wed Apr 23 22:22:37 2014 +0100
+++ b/src/database.c	Fri Feb 27 17:47:15 2015 +0000
@@ -83,6 +83,7 @@
 #endif /* HAVE_BERKELEY_DB */
 
 #ifdef HAVE_DBM
+BEGIN_C_DECLS
 # ifdef TRUST_NDBM_H_PROTOTYPES
 #  include NDBM_H_FILE
 # else /* not TRUST_NDBM_H_PROTOTYPES */
@@ -91,10 +92,6 @@
 using C++, since they are of the form `datum dbm_firstkey()', without any
 args given. */
 
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 /* Parameters to dbm_store for simple insertion or replacement. */
 #define  DBM_INSERT  0
 #define  DBM_REPLACE 1
@@ -119,11 +116,9 @@
 DBM    *dbm_open(const char *, int, mode_t);
 int     dbm_store(DBM *, datum, datum, int);
 
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
+# endif /* (not) TRUST_NDBM_H_PROTOTYPES */
+END_C_DECLS
 
-# endif /* (not) TRUST_NDBM_H_PROTOTYPES */
 Lisp_Object Qdbm;
 #endif /* HAVE_DBM */