Imported Upstream version 1.7.2+dfsg

1 files changed, 50 insertions, 3 deletions

diff --git a/include/defs.h b/include/defs.h
index d6884d3..fd1ebf5 100644
--- a/include/defs.h
+++ b/include/defs.h
@@ -1,5 +1,26 @@
+/******************************************************************************
+ *
+ *  defs.h -	Global defines, mostly platform-specific stuff
+ *
+ * $Id: defs.h 2942 2013-08-03 08:39:02Z chrislit $
+ *
+ * Copyright 2000-2013 CrossWire Bible Society (http://www.crosswire.org)
+ *	CrossWire Bible Society
+ *	P. O. Box 2528
+ *	Tempe, AZ  85280-2528
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ */
 // ----------------------------------------------------------------------------
-// Making or using sword as a Windows DLL
+// 
 // ----------------------------------------------------------------------------
 #ifndef SWORDDEFS_H
 #define SWORDDEFS_H
@@ -48,6 +69,9 @@ SWORD_NAMESPACE_START
 #    define SWDLLEXPORT_CTORFN
 #  endif
 
+#  define SWDEPRECATED __declspec(deprecated("** WARNING: deprecated method **"))
+
+
 #elif defined(__SWPM__)
 
 #  ifdef SWMAKINGDLL
@@ -64,6 +88,9 @@ SWORD_NAMESPACE_START
 #    define SWDLLEXPORT_CTORFN
 #  endif
 
+#  define SWDEPRECATED 
+
+
 #elif defined(__GNUWIN32__)
 
 #  ifdef SWMAKINGDLL
@@ -80,6 +107,9 @@ SWORD_NAMESPACE_START
 #    define SWDLLEXPORT_CTORFN
 #  endif
 
+#  define SWDEPRECATED  __attribute__((__deprecated__))
+
+
 #elif defined(__BORLANDC__)
 #  ifdef SWMAKINGDLL
 #    define SWDLLEXPORT _export
@@ -95,12 +125,26 @@ SWORD_NAMESPACE_START
 #    define SWDLLEXPORT_CTORFN
 #  endif
 
+#define COMMENT SLASH(/)
+#define SLASH(s) /##s
+#  define SWDEPRECATED COMMENT
+
+
+#elif defined(__GNUC__)
+#  define SWDLLEXPORT
+#  define SWDLLEXPORT_DATA(type) type
+#  define SWDLLEXPORT_CTORFN
+#  define SWDEPRECATED  __attribute__((__deprecated__))
+
+
 #else
 #  define SWDLLEXPORT
 #  define SWDLLEXPORT_DATA(type) type
 #  define SWDLLEXPORT_CTORFN
+#  define SWDEPRECATED
 #endif
 
+
 // For ostream, istream ofstream
 #if defined(__BORLANDC__) && defined( _RTLDLL )
 #  define SWDLLIMPORT __import
@@ -108,9 +152,12 @@ SWORD_NAMESPACE_START
 #  define SWDLLIMPORT
 #endif
 
+
+
 enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI};
-enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI};
-enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_UTF16, ENC_RTF, ENC_HTML};
+enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI, FMT_XHTML};
+enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML};
+enum {BIB_BIBTEX = 0, /* possible future formats: BIB_MARCXML, BIB_MARC21, BIB_DCMI BIB_OSISHEADER, BIB_SBL_XHTML, BIB_MLA_XHTML, BIB_APA_XHTML, BIB_CHICAGO_XHTML */};
 
 SWORD_NAMESPACE_END
 #endif //SWORDDEFS_H