[GRASS-SVN] r35625 - in grass/branches/releasebranch_6_4: lib/form vector/v.digit visualization/nviz/src

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-01-25 15:10:13 -0500 (Sun, 25 Jan 2009)
New Revision: 35625

Modified:
   grass/branches/releasebranch_6_4/lib/form/form.c
   grass/branches/releasebranch_6_4/vector/v.digit/form.c
   grass/branches/releasebranch_6_4/visualization/nviz/src/Makefile
Log:
hack (http://www.tcl.tk/cgi-bin/tct/tip/330.html) for Tcl8.6 until patch in trac #462 is verified

Modified: grass/branches/releasebranch_6_4/lib/form/form.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/form/form.c	2009-01-25 20:07:56 UTC (rev 35624)
+++ grass/branches/releasebranch_6_4/lib/form/form.c	2009-01-25 20:10:13 UTC (rev 35625)
@@ -5,8 +5,12 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/types.h>
+
+/* hack for tcl 8.6 */
+#define USE_INTERP_RESULT
 #include <tcl.h>
 #include <tk.h>
+
 #include <locale.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>

Modified: grass/branches/releasebranch_6_4/vector/v.digit/form.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.digit/form.c	2009-01-25 20:07:56 UTC (rev 35624)
+++ grass/branches/releasebranch_6_4/vector/v.digit/form.c	2009-01-25 20:10:13 UTC (rev 35625)
@@ -5,8 +5,12 @@
 #include <fcntl.h>
 #include <sys/time.h>
 #include <sys/types.h>
+
+/* hack for tcl 8.6 */
+#define USE_INTERP_RESULT
 #include <tcl.h>
 #include <tk.h>
+
 #include <locale.h>
 #include <grass/gis.h>
 #include <grass/dbmi.h>

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/Makefile
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/Makefile	2009-01-25 20:07:56 UTC (rev 35624)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/Makefile	2009-01-25 20:10:13 UTC (rev 35625)
@@ -30,7 +30,7 @@
 EXTRA_CFLAGS= $(TCLINCDIR) $(TKINCDIR) \
 	$(INC) \
 	$(TIFFINCPATH) $(DSPINC) \
-	$(VECT_CFLAGS) $(OPENGLINC)
+	$(VECT_CFLAGS) $(OPENGLINC) -D USE_INTERP_RESULT
 
 ifeq ($(OPENGL_X11),1)
 EXTRA_CFLAGS += $(XCFLAGS)