Changeset 22089 for main

Timestamp:

2010-05-14T19:20:45+12:00 (14 years ago)

Author:

ak19

Message:

1. Dr Bainbridge added a pipe close call (pclose) which was needed after a popen in one of the jdbmnaiveclass methods. 2. Needed to remove some includes that are used with gdbm NOT jdbm.

Location:

main/trunk/greenstone2/common-src/src/lib

Files:

• jdbmnaiveclass.cpp (modified) (1 diff)
• jdbmnaiveclass.h (modified) (1 diff)

main/trunk/greenstone2/common-src/src/lib/jdbmnaiveclass.cpp

@@ -211 +211 @@
   data = to_uni(data);  // convert to unicode
 
+  pclose(PIN);
+
   return true;
 }

main/trunk/greenstone2/common-src/src/lib/jdbmnaiveclass.h

@@ -40 +40 @@
 #include "dbclass.h"
 
-#ifdef __WIN32__
-
-#ifdef __cplusplus
-  extern "C" {
-#endif
-// Check to see if these are still needed // *****
-#include "autoconf.h"
-#include "systems.h"
-#ifdef __cplusplus
-  }
-#endif
-
-#endif
-
-
 class jdbmnaiveclass : public dbclass
 {