comparison src/database.c @ 5922:4b055de36bb9 cygwin

merging heads 2
author Henry Thompson <ht@markup.co.uk>
date Fri, 27 Feb 2015 17:47:15 +0000
parents 5d5aeb79edb4
children
comparison
equal deleted inserted replaced
5921:68639fb08af8 5922:4b055de36bb9
81 Lisp_Object Qqueue; 81 Lisp_Object Qqueue;
82 #endif 82 #endif
83 #endif /* HAVE_BERKELEY_DB */ 83 #endif /* HAVE_BERKELEY_DB */
84 84
85 #ifdef HAVE_DBM 85 #ifdef HAVE_DBM
86 BEGIN_C_DECLS
86 # ifdef TRUST_NDBM_H_PROTOTYPES 87 # ifdef TRUST_NDBM_H_PROTOTYPES
87 # include NDBM_H_FILE 88 # include NDBM_H_FILE
88 # else /* not TRUST_NDBM_H_PROTOTYPES */ 89 # else /* not TRUST_NDBM_H_PROTOTYPES */
89 90
90 /* The prototypes in gdbm/ndbm.h currently are broken when compiling 91 /* The prototypes in gdbm/ndbm.h currently are broken when compiling
91 using C++, since they are of the form `datum dbm_firstkey()', without any 92 using C++, since they are of the form `datum dbm_firstkey()', without any
92 args given. */ 93 args given. */
93
94 #if defined(__cplusplus) || defined(c_plusplus)
95 extern "C" {
96 #endif
97 94
98 /* Parameters to dbm_store for simple insertion or replacement. */ 95 /* Parameters to dbm_store for simple insertion or replacement. */
99 #define DBM_INSERT 0 96 #define DBM_INSERT 0
100 #define DBM_REPLACE 1 97 #define DBM_REPLACE 1
101 98
117 datum dbm_firstkey(DBM *); 114 datum dbm_firstkey(DBM *);
118 datum dbm_nextkey(DBM *); 115 datum dbm_nextkey(DBM *);
119 DBM *dbm_open(const char *, int, mode_t); 116 DBM *dbm_open(const char *, int, mode_t);
120 int dbm_store(DBM *, datum, datum, int); 117 int dbm_store(DBM *, datum, datum, int);
121 118
122 #if defined(__cplusplus) || defined(c_plusplus)
123 }
124 #endif
125
126 # endif /* (not) TRUST_NDBM_H_PROTOTYPES */ 119 # endif /* (not) TRUST_NDBM_H_PROTOTYPES */
120 END_C_DECLS
121
127 Lisp_Object Qdbm; 122 Lisp_Object Qdbm;
128 #endif /* HAVE_DBM */ 123 #endif /* HAVE_DBM */
129 124
130 Lisp_Object Vdatabase_coding_system; 125 Lisp_Object Vdatabase_coding_system;
131 126