sync with crosswire 20021018-1300

1 files changed, 37 insertions, 40 deletions

diff --git a/include/flatapi.h b/include/flatapi.h
index 029d851..c110c5b 100644
--- a/include/flatapi.h
+++ b/include/flatapi.h
@@ -1,11 +1,11 @@
 #ifndef SWORDAPI_H
 #define SWORDAPI_H
 
-#include <swmodule.h>
-#include <swkey.h>
-#include <versekey.h>
-#include <swmgr.h>
-
+//#include <swmodule.h>
+//#include <swkey.h>
+//#include <versekey.h>
+//#include <swmgr.h>
+#include <defs.h>
 #ifdef __cplusplus
 #endif
 
@@ -13,63 +13,60 @@ extern "C" {
 
 #define SWHANDLE int
 
-typedef struct {
-	ModMap::iterator it;
-	ModMap::iterator end;
-} ModItType;
+//using namespace sword;
 
 //-----------------------------------------------------------------
 // stringlist_iterator methods
 
-void stringlist_iterator_next(SWHANDLE hsli);
-const char *stringlist_iterator_val(SWHANDLE hsli);
+void SWDLLEXPORT stringlist_iterator_next(SWHANDLE hsli);
+const char * SWDLLEXPORT stringlist_iterator_val(SWHANDLE hsli);
 
 
 //-----------------------------------------------------------------
 // modmap methods
 //
-void ModList_iterator_next(SWHANDLE hmmi);
-SWHANDLE ModList_iterator_val(SWHANDLE hmmi);
+void SWDLLEXPORT ModList_iterator_next(SWHANDLE hmmi);
+SWHANDLE SWDLLEXPORT ModList_iterator_val(SWHANDLE hmmi);
 
 
 //-----------------------------------------------------------------
 // SWMgr methods
 //
-SWHANDLE SWMgr_new();
+SWHANDLE SWDLLEXPORT SWMgr_new();
 // SWConfig *, SWConfig *, bool, SWFilterMgr *
-SWHANDLE SWMgr_newEx(SWHANDLE hiconfig, SWHANDLE hisysconfig, char autoload, SWHANDLE hfilterMgr);
-void     SWMgr_delete(SWHANDLE hmgr);
-SWHANDLE SWMgr_getConfig(SWHANDLE hmgr);
-SWHANDLE SWMgr_getModulesIterator(SWHANDLE hmgr);
-SWHANDLE SWMgr_getModuleByName(SWHANDLE hmgr, const char *name);
-const char *   SWMgr_getPrefixPath(SWHANDLE hmgr);
-const char *   SWMgr_getConfigPath(SWHANDLE hmgr);
-void     SWMgr_setGlobalOption(SWHANDLE hmgr, const char *option, const char *value);
-const char *   SWMgr_getGlobalOption(SWHANDLE hmgr, const char *option);
-const char *   SWMgr_getGlobalOptionTip(SWHANDLE hmgr, const char *option);
+SWHANDLE SWDLLEXPORT SWMgr_newEx(SWHANDLE hiconfig, SWHANDLE hisysconfig, char autoload, SWHANDLE hfilterMgr);
+void     SWDLLEXPORT SWMgr_delete(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getConfig(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getModulesIterator(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getModuleByName(SWHANDLE hmgr, const char *name);
+const char *   SWDLLEXPORT SWMgr_getPrefixPath(SWHANDLE hmgr);
+const char *   SWDLLEXPORT SWMgr_getConfigPath(SWHANDLE hmgr);
+void     SWDLLEXPORT SWMgr_setGlobalOption(SWHANDLE hmgr, const char *option, const char *value);
+const char *   SWDLLEXPORT SWMgr_getGlobalOption(SWHANDLE hmgr, const char *option);
+const char *   SWDLLEXPORT SWMgr_getGlobalOptionTip(SWHANDLE hmgr, const char *option);
 // ret: forward_iterator
-SWHANDLE SWMgr_getGlobalOptionsIterator(SWHANDLE hmgr);
+SWHANDLE SWDLLEXPORT SWMgr_getGlobalOptionsIterator(SWHANDLE hmgr);
 // ret: forward_iterator
-SWHANDLE SWMgr_getGlobalOptionValuesIterator(SWHANDLE hmgr, const char *option);
-void     SWMgr_setCipherKey(SWHANDLE hmgr, const char *modName, const char *key);
+SWHANDLE SWDLLEXPORT SWMgr_getGlobalOptionValuesIterator(SWHANDLE hmgr, const char *option);
+void     SWDLLEXPORT SWMgr_setCipherKey(SWHANDLE hmgr, const char *modName, const char *key);
 
 
 //-----------------------------------------------------------------
 // SWModule methods
 
-void  SWModule_terminateSearch(SWHANDLE hmodule);
-char  SWModule_error(SWHANDLE hmodule);
-int   SWModule_getEntrySize(SWHANDLE hmodule);
-void  SWModule_setKeyText(SWHANDLE hmodule, const char *key);
-const char *SWModule_getKeyText(SWHANDLE hmodule);
-const char *SWModule_getName(SWHANDLE hmodule);
-const char *SWModule_getDescription(SWHANDLE hmodule);
-const char *SWModule_getType(SWHANDLE hmodule);
-void  SWModule_previous(SWHANDLE hmodule);
-void  SWModule_next(SWHANDLE hmodule);
-void  SWModule_begin(SWHANDLE hmodule);
-const char *SWModule_getStripText(SWHANDLE hmodule);
-const char *SWModule_getRenderText(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_terminateSearch(SWHANDLE hmodule);
+char  SWDLLEXPORT SWModule_error(SWHANDLE hmodule);
+int   SWDLLEXPORT SWModule_getEntrySize(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_setKeyText(SWHANDLE hmodule, const char *key);
+const char * SWDLLEXPORT SWModule_getKeyText(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getName(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getDescription(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getType(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_previous(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_next(SWHANDLE hmodule);
+void  SWDLLEXPORT SWModule_begin(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getStripText(SWHANDLE hmodule);
+const char * SWDLLEXPORT SWModule_getRenderText(SWHANDLE hmodule);
 
 }
 #ifdef __cplusplus