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

Timestamp:

2013-06-14T17:32:25+12:00 (11 years ago)

Author:

ak19

Message:

File lock code currently experimental, so not in the main greenstone build sequence.

Location:

main/trunk/greenstone2/common-src/src/gdbmedit/db2txt

Files:

• db2txt.cpp (modified) (2 diffs)
• filelock.cpp (modified) (1 diff)

main/trunk/greenstone2/common-src/src/gdbmedit/db2txt/db2txt.cpp

@@ -31 +31 @@
 
 #else
-
-/* header file for mkdir */
-#include <sys/stat.h>
-#include <sys/types.h>
-
 #include <gdbm.h>
 #endif
@@ -78 +73 @@
 #endif
 
+#ifdef _GSDL_FLOCK_ENABLED
 // John Thompson's lock() and unlock() needed in parallel building
 // parked in separate file to help readability of main code
 #include "filelock.cpp"
+#endif
 
 void print_usage (char *program_name) {

main/trunk/greenstone2/common-src/src/gdbmedit/db2txt/filelock.cpp

@@ -5 +5 @@
 
 #else
+
+/* header file for mkdir */
+#include <sys/stat.h>
+#include <sys/types.h>
+
 // assume Unix
 // lock a file on linux