Revision: 75519
http://sourceforge.net/p/brlcad/code/75519
Author: starseeker
Date: 2020-04-22 01:36:35 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Use tclcad header
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm.h
brlcad/branches/dm-fb-merge/include/tclcad.h
brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c
brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c
brlcad/branches/dm-fb-merge/src/libtclcad/fb_obj.c
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-04-22 01:23:32 UTC (rev
75518)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-04-22 01:36:35 UTC (rev
75519)
@@ -473,11 +473,6 @@
#define FB_DEBUG_RW 4 /* Contents of reads and writes */
#define FB_DEBUG_BRW 8 /* Buffered IO rpixel and wpixel */
-/* tcl.c */
-/* The presence of Tcl_Interp as an arg prevents giving arg list */
-FB_EXPORT extern void fb_tcl_setup(void);
-FB_EXPORT extern int Fb_Init(Tcl_Interp *interp);
-
/**
* report version information about LIBFB
*/
Modified: brlcad/branches/dm-fb-merge/include/tclcad.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/tclcad.h 2020-04-22 01:23:32 UTC
(rev 75518)
+++ brlcad/branches/dm-fb-merge/include/tclcad.h 2020-04-22 01:36:35 UTC
(rev 75519)
@@ -481,6 +481,13 @@
TCLCAD_EXPORT void
tclcad_delete_io_handler(void *interp, void *chan, struct bu_process *p, int
fd, void *data, ged_io_handler_callback_t callback);
+
+/* dm_tcl.c */
+/* The presence of Tcl_Interp as an arg prevents giving arg list */
+TCLCAD_EXPORT extern void fb_tcl_setup(void);
+TCLCAD_EXPORT extern int Fb_Init(Tcl_Interp *interp);
+
+
__END_DECLS
#endif /* TCLCAD_H */
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c 2020-04-22 01:23:32 UTC
(rev 75518)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/dm_obj.c 2020-04-22 01:36:35 UTC
(rev 75519)
@@ -45,6 +45,7 @@
#include "rt/solid.h"
#include "dm.h"
#include "../libdm/include/private.h"
+#include "tclcad.h"
/**
*@brief
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c 2020-04-22 01:23:32 UTC
(rev 75518)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/dm_tcl.c 2020-04-22 01:36:35 UTC
(rev 75519)
@@ -41,6 +41,7 @@
#include "bu/cmd.h"
#include "bu/log.h"
#include "bu/vls.h"
+#include "tclcad.h"
/* private headers */
#include "../libdm/include/private.h"
#include "brlcad_version.h"
Modified: brlcad/branches/dm-fb-merge/src/libtclcad/fb_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libtclcad/fb_obj.c 2020-04-22 01:23:32 UTC
(rev 75518)
+++ brlcad/branches/dm-fb-merge/src/libtclcad/fb_obj.c 2020-04-22 01:36:35 UTC
(rev 75519)
@@ -44,6 +44,7 @@
#include "bu/str.h"
#include "../libdm/include/private.h"
#include "dm.h"
+#include "tclcad.h"
/* defined in libfb/tcl.c */
extern int fb_refresh(struct fb *ifp, int x, int y, int w, int h);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits