Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26436/modules/pftijah
Modified Files:
Tag: XQuery_0-18
nexi.c nexi_generate_mil.c nexi_preprocessor.c
serialize_pftijah.mx
Log Message:
Compile with HAE_PFTIJAH on Windows.
Fixes to get it to compile:
- don't include getopt.h and strings.h (they don't exist on Windows,
and they weren't actually needed)
- don't use the type str in file included by fled-generated code: it
uses ptr as a variable name, and ptr is declared as a type in the same
include file str is declared (so we also make sure gdk.h is not
included there)
Also, updated to newer libxml2 library.
Index: serialize_pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/serialize_pftijah.mx,v
retrieving revision 1.49.2.3
retrieving revision 1.49.2.4
diff -u -d -r1.49.2.3 -r1.49.2.4
--- serialize_pftijah.mx 7 Jun 2007 14:17:58 -0000 1.49.2.3
+++ serialize_pftijah.mx 15 Jun 2007 08:17:12 -0000 1.49.2.4
@@ -25,8 +25,6 @@
@t serialize_pftijah
@h
-#include <gdk.h>
-
struct tijahContextStruct;
extern int handleTijahTerm(struct tijahContextStruct *ctx, char* term);
@@ -38,7 +36,7 @@
extern char* normalizeTerm(struct tijahContextStruct *ctx, char* term );
-extern int CMDtj_normalizeTerm(char** res, str term, str stemmer);
+extern int CMDtj_normalizeTerm(char** res, char *term, char *stemmer);
@c
#include <pf_config.h>
@@ -57,6 +55,8 @@
#include "serialize_null.h"
#include "serialize_pftijah.h"
+#include <gdk.h>
+
#include "pftijah_stem.h"
#include "pftijah_util.h"
@@ -950,7 +950,7 @@
return res;
}
-int CMDtj_normalizeTerm(char** res, str term, str stemmer) {
+int CMDtj_normalizeTerm(char** res, char *term, char *stemmer) {
tjStemCtx* stemCtx = getStemmingContext( stemmer );
if ( stemCtx->stem ) {
Index: nexi_generate_mil.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi_generate_mil.c,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- nexi_generate_mil.c 4 Jun 2007 17:42:06 -0000 1.33.2.1
+++ nexi_generate_mil.c 15 Jun 2007 08:17:12 -0000 1.33.2.2
@@ -34,7 +34,6 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
-#include <strings.h>
#include <assert.h>
#include <gdk.h>
Index: nexi_preprocessor.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi_preprocessor.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- nexi_preprocessor.c 21 Mar 2007 07:35:28 -0000 1.8
+++ nexi_preprocessor.c 15 Jun 2007 08:17:12 -0000 1.8.2.1
@@ -33,7 +33,6 @@
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
-#include <strings.h>
#include "nexi.h"
#include <pftijah_stem.h>
Index: nexi.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi.c,v
retrieving revision 1.64.2.1
retrieving revision 1.64.2.2
diff -u -d -r1.64.2.1 -r1.64.2.2
--- nexi.c 4 Jun 2007 17:42:05 -0000 1.64.2.1
+++ nexi.c 15 Jun 2007 08:17:12 -0000 1.64.2.2
@@ -73,7 +73,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <getopt.h>
#include <string.h>
#include "pftijah.h"
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
