Changeset 29327

Timestamp:

2014-09-22T18:13:42+12:00 (10 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed mg segmentation fault on Mac Lion, Mountain Lion and Maverick. On these Macs, mg collections didn't work. At least one mg binary (mg_passes) segfaulted. The problem was that functions GetEnv and IntEnv were declared at a point where their return types were not known. The compiler gave out a warning that the return type was being defaulted to an int (4 bytes). As a result of this, running in the debugger showed that the return values from these functions had got truncated. Dr Bainbridge allowed the files with the functions to know the return types at the necessary time during compilation by ensuring the necessary header files (mglong.h and environment.h) were included at the right time and in the right places so that they were available to the c functions and files that needed to know about them.

Location:

main/trunk/greenstone2/common-src/indexers/mg/src/text

Files:

• environment.h (modified) (1 diff)
• words.h (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mg/src/text/environment.h

@@ -25 +25 @@
 #ifndef ENVIRONMENT_H
 #define ENVIRONMENT_H
+
+#include "mglong.h"
 
 #define OUTPUT_TEXT     'T'

main/trunk/greenstone2/common-src/indexers/mg/src/text/words.h

@@ -25 +25 @@
 #include "sysfuncs.h"
 #include "unitool.h"
+
+#include "environment.h"
 
 /*