[sword-svn] r2351 - trunk/include

[scribe at crosswire.org]

Author: scribe
Date: 2009-04-27 00:30:54 -0700 (Mon, 27 Apr 2009)
New Revision: 2351

Modified:
   trunk/include/config.h
   trunk/include/versekey.h
Log:
changed anonymous struct definition in versekey to a more traditional 2 step definition/declaration to help swig understand


Modified: trunk/include/config.h
===================================================================
--- trunk/include/config.h	2009-04-27 07:11:46 UTC (rev 2350)
+++ trunk/include/config.h	2009-04-27 07:30:54 UTC (rev 2351)
@@ -40,6 +40,10 @@
 /* Define to 1 if you have the `vsnprintf' function. */
 #define HAVE_VSNPRINTF 1
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
 /* Name of package */
 #define PACKAGE "sword"
 

Modified: trunk/include/versekey.h
===================================================================
--- trunk/include/versekey.h	2009-04-27 07:11:46 UTC (rev 2350)
+++ trunk/include/versekey.h	2009-04-27 07:30:54 UTC (rev 2351)
@@ -91,9 +91,12 @@
 
 	// internal upper/lower bounds optimizations
 	mutable long lowerBound, upperBound;	// if autonorms is on
-	mutable struct { int test; int book; int chap; int verse; } lowerBoundComponents, upperBoundComponents;	// if autonorms is off, we can't optimize with index
 	mutable VerseKey *tmpClone;
 
+	typedef struct { int test; int book; int chap; int verse; } VerseComponents;
+
+	mutable VerseComponents lowerBoundComponents, upperBoundComponents;	// if autonorms is off, we can't optimize with index
+
 protected:
 
 	/** The Testament: 0 - Module Heading; 1 - Old; 2 - New