Changeset 10436

Timestamp:

2005-08-08T16:10:00+12:00 (19 years ago)

Author:

kjdon

Message:

moved the yaz headers to the top or teh include list to avoid namespace conflicts

Location:

trunk/gsdl/src/colservr

Files:

• z3950parser.h (modified) (2 diffs)
• z3950server.cpp (modified) (3 diffs)

trunk/gsdl/src/colservr/z3950parser.h

@@ -27 +27 @@
 #define Z3950PARSER_H
 
+// YAZ headers
+extern "C" {
+#include <yaz/backend.h>
+#include <yaz/log.h>
+#ifdef ASN_COMPILED
+#include <yaz/ill.h>
+#endif
+}
 
 #include <string>
@@ -42 +50 @@
 #include "nullproto.h"
 #include "z3950_to_gsdl.h"
-
-// YAZ headers
-#include <yaz/backend.h>
-#include <yaz/log.h>
-#ifdef ASN_COMPILED
-#include <yaz/ill.h>
-#endif
-
 
 extern text_t gsdlhome;

trunk/gsdl/src/colservr/z3950server.cpp

@@ +1 @@
+
+// YAZ headers
+#include <yaz/backend.h>
+#include <yaz/log.h>
+#ifdef ASN_COMPILED
+#include <yaz/ill.h>
+#endif
+
+
 // Standard headers
 
@@ -28 +37 @@
 #include "recptproto.h"
 #include "nullproto.h"
-
-// YAZ headers
-#include <yaz/backend.h>
-#include <yaz/log.h>
-#ifdef ASN_COMPILED
-#include <yaz/ill.h>
-#endif
 
 
@@ -943 +945 @@
 int main (int argc, char *argv[])
 {
+  
   const int statserv_var =  statserv_main(argc, argv, bend_init, bend_close);
   cerr << "statserv_main returns: " << statserv_var << endl;