Revision: 65571
http://sourceforge.net/p/brlcad/code/65571
Author: starseeker
Date: 2015-07-11 02:05:35 +0000 (Sat, 11 Jul 2015)
Log Message:
-----------
Shove brlcad_interp up from libbu into librt, which appears to be the next
lowest level library that actually uses this interp.
Modified Paths:
--------------
brlcad/trunk/include/bu/bu_tcl.h
brlcad/trunk/include/rt/global.h
brlcad/trunk/src/libbu/tcl.c
brlcad/trunk/src/librt/globals.c
brlcad/trunk/src/librt/tcl.c
Modified: brlcad/trunk/include/bu/bu_tcl.h
===================================================================
--- brlcad/trunk/include/bu/bu_tcl.h 2015-07-11 01:43:56 UTC (rev 65570)
+++ brlcad/trunk/include/bu/bu_tcl.h 2015-07-11 02:05:35 UTC (rev 65571)
@@ -39,9 +39,6 @@
/** @{ */
/** @file bu/bu_tcl.h */
-/* FIXME Temporary global interp. Remove me. */
-BU_EXPORT extern Tcl_Interp *brlcad_interp;
-
/**
* Bu_Init
*
Modified: brlcad/trunk/include/rt/global.h
===================================================================
--- brlcad/trunk/include/rt/global.h 2015-07-11 01:43:56 UTC (rev 65570)
+++ brlcad/trunk/include/rt/global.h 2015-07-11 02:05:35 UTC (rev 65571)
@@ -25,11 +25,17 @@
#define RT_GLOBAL_H
#include "common.h"
+
+#include "tcl.h" /* Included for Tcl_Interp definition */
+
#include "vmath.h"
#include "rt/defines.h"
__BEGIN_DECLS
+/* FIXME Temporary global interp. Remove me. */
+RT_EXPORT extern Tcl_Interp *brlcad_interp;
+
/**
* Definitions for librt.a which are global to the library regardless
* of how many different models are being worked on
@@ -72,6 +78,7 @@
#define RT_VLIST_SET_LINE_WIDTH(hd, width)
BN_VLIST_SET_LINE_WIDTH(&RTG.rtg_vlfree, hd, width)
+
__END_DECLS
#endif /* RT_GLOBAL_H */
Modified: brlcad/trunk/src/libbu/tcl.c
===================================================================
--- brlcad/trunk/src/libbu/tcl.c 2015-07-11 01:43:56 UTC (rev 65570)
+++ brlcad/trunk/src/libbu/tcl.c 2015-07-11 02:05:35 UTC (rev 65571)
@@ -36,14 +36,9 @@
#include "bu/bu_tcl.h"
#include "vmath.h"
-
-/*XXX Temporary global interp */
-Tcl_Interp *brlcad_interp = (Tcl_Interp *)0;
-
#define TINYBUFSIZ 32
#define SMALLBUFSIZ 256
-
/**
* A wrapper for bu_mem_barriercheck.
*
@@ -436,9 +431,6 @@
{(const char *)NULL, BU_CMD_NULL}
};
- /*XXX Use of brlcad_interp is temporary */
- brlcad_interp = interp;
-
register_cmds(interp, cmds);
Tcl_SetVar(interp, "BU_DEBUG_FORMAT", BU_DEBUG_FORMAT, TCL_GLOBAL_ONLY);
Modified: brlcad/trunk/src/librt/globals.c
===================================================================
--- brlcad/trunk/src/librt/globals.c 2015-07-11 01:43:56 UTC (rev 65570)
+++ brlcad/trunk/src/librt/globals.c 2015-07-11 02:05:35 UTC (rev 65571)
@@ -32,9 +32,13 @@
#include "common.h"
+#include "tcl.h"
+
#include "raytrace.h"
#include "rt/db4.h"
+/*XXX Temporary global interp */
+Tcl_Interp *brlcad_interp = (Tcl_Interp *)0;
struct rt_g RTG = RT_G_INIT_ZERO;
Modified: brlcad/trunk/src/librt/tcl.c
===================================================================
--- brlcad/trunk/src/librt/tcl.c 2015-07-11 01:43:56 UTC (rev 65570)
+++ brlcad/trunk/src/librt/tcl.c 2015-07-11 02:05:35 UTC (rev 65571)
@@ -712,6 +712,9 @@
Tcl_LinkVar(interp, "rt_bot_tri_per_piece",
(char *)&rt_bot_tri_per_piece, TCL_LINK_WIDE_INT);
+
+ /*XXX Use of brlcad_interp is temporary */
+ brlcad_interp = interp;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
