[GRASS-SVN] r46213 - in grass-addons/grass7/raster/r.fuzzy: r.fuzzy.set r.fuzzy.system

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-05-09 05:02:05 -0700 (Mon, 09 May 2011)
New Revision: 46213

Modified:
   grass-addons/grass7/raster/r.fuzzy/r.fuzzy.set/local_proto.h
   grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h
Log:
compilation fix

Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.set/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.set/local_proto.h	2011-05-09 11:56:05 UTC (rev 46212)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.set/local_proto.h	2011-05-09 12:02:05 UTC (rev 46213)
@@ -27,10 +27,16 @@
 #define LEFT 1
 #define RIGHT 2
 
-char *input, *output;
-float shape, height;
-int type, side;
-double p[4]; /* inflection points */
-int num_points;
+#ifdef MAIN
+#       define GLOBAL
+#else
+#       define GLOBAL extern
+#endif
 
+GLOBAL char *input, *output;
+GLOBAL float shape, height;
+GLOBAL int type, side;
+GLOBAL double p[4]; /* inflection points */
+GLOBAL int num_points;
+
 float fuzzy (FCELL cell);

Modified: grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h
===================================================================
--- grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h	2011-05-09 11:56:05 UTC (rev 46212)
+++ grass-addons/grass7/raster/r.fuzzy/r.fuzzy.system/local_proto.h	2011-05-09 12:02:05 UTC (rev 46213)
@@ -144,23 +144,24 @@
 } OUTPUTS;
 
 
-STRING var_name_file;
-STRING rule_name_file;
-STRING output;
-MAPS *s_maps;
-RULES *s_rules;
-OUTPUTS *m_outputs;
-float **visual_output;
-float *universe;
-float *antecedents;
-float *agregate;
-int nmaps, nrules, output_index, multiple, membership_only, coor_proc;
-int resolution;
-implications implication;
-defuzz defuzzyfication;
-logics family;
+GLOBAL STRING var_name_file;
+GLOBAL STRING rule_name_file;
+GLOBAL STRING output;
+GLOBAL MAPS *s_maps;
+GLOBAL RULES *s_rules;
+GLOBAL OUTPUTS *m_outputs;
+GLOBAL float **visual_output;
+GLOBAL float *universe;
+GLOBAL float *antecedents;
+GLOBAL float *agregate;
+GLOBAL int nmaps, nrules, output_index, multiple, membership_only, coor_proc;
+GLOBAL int resolution;
+GLOBAL implications implication;
+GLOBAL defuzz defuzzyfication;
+GLOBAL logics family;
 
-char **rules;
+GLOBAL char **rules;
+GLOBAL int HERE;
 
 int char_strip(char *buf, char rem);
 int char_copy(const char *buf, char *res, int start, int stop);
@@ -176,7 +177,6 @@
 int get_rows(int row);
 int get_cells(int col);
 
-int HERE;
 int parse_sets(SETS * set, char buf[], const char mapname[]);
 int parse_rules(int rule_num, int n, char buf[]);
 void process_coors(char *answer);