Changeset 28101 for main/trunk/greenstone2/common-src

Timestamp:

2013-08-20T15:51:53+12:00 (11 years ago)

Author:

ak19

Message:

Dr Bainbridge's bugfix. The gdbm_errno variable exported by gdbm.h is now being used by db2txt and txt2db. However, db2txt and txt2db are cpp files, whereas the variable was compiled up in a .c file. In order to make that variable visible to cpp files, Dr Bainbridge had to have its extern declarations made in a special extern C block for when cplusplus is defined, so that a cpp program being compiled up can see the variable at last.

Location:

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3

Files:

• gdbmerrno.h (modified) (1 diff)
• windows/gdbm.h (modified) (2 diffs)

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/gdbmerrno.h

@@ -53 +53 @@
 typedef int gdbm_error;     /* For compatibilities sake. */
 
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
 extern gdbm_error gdbm_errno;
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif

main/trunk/greenstone2/common-src/packages/gdbm/gdbm-1.8.3/windows/gdbm.h

@@ -126 +126 @@
 #define GDBM_OPT_ILLEGAL    20
 typedef int gdbm_error;     /* For compatibilities sake. */
-extern gdbm_error gdbm_errno;
+
 
 /* extra prototypes */
@@ -135 +135 @@
 #endif
 
+extern gdbm_error gdbm_errno;
+
 extern char *gdbm_strerror __P((gdbm_error));