[Snowball-discuss] More patches

[Charlie Hull]

Hi all,

I have a patch to your patches! I've been trying to build Snowball from 
Xapian SVN-HEAD using Visual C++ 2005 Express Edition, and it is unhappy 
with the way you're checking options.make_lang - I think it's having 
trouble resolving the scope of the enum.

Anyway, simple patch attached. This doesn't apply to the current 
Snowball SVN-HEAD, but does to the version in Xapian SVN-HEAD (i.e. the 
version that Olly has written to output in C++) - I'm assuming this is 
the right place to post about it.

Cheers

Charlie

-- 
Charlie Hull
Lemur Consulting Limited

tel/fax: +44 (0)8700 118334
mobile:  +44 (0)7767 825828
web: www.lemurconsulting.com
-------------- next part --------------
Index: header.h
===================================================================
--- header.h	(revision 7721)
+++ header.h	(working copy)
@@ -276,6 +276,10 @@
     int keep_count;	 /* used to number keep/restore pairs to avoid compiler warnings about shadowed variables */
 };
 
+#define LANG_JAVA	1
+#define LANG_C		2
+#define LANG_CPLUSPLUS	3
+
 struct options {
 
     /* for the command line: */
@@ -287,7 +291,7 @@
     FILE * output_java;
     byte syntax_tree;
     byte widechars;
-    enum { LANG_JAVA, LANG_C, LANG_CPLUSPLUS } make_lang;
+    int make_lang;
     char * externals_prefix;
     char * variables_prefix;
     char * runtime_path;