Revision: 75524
http://sourceforge.net/p/brlcad/code/75524
Author: starseeker
Date: 2020-04-22 13:13:19 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Don't explicitly use Tcl_Interp in the fbserv_obj
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm.h
brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-04-22 05:43:00 UTC (rev
75523)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-04-22 13:13:19 UTC (rev
75524)
@@ -556,7 +556,7 @@
struct fbserv_obj {
struct fb *fbs_fbp; /**< @brief framebuffer pointer
*/
- Tcl_Interp *fbs_interp; /**< @brief tcl interpreter */
+ void *fbs_interp; /**< @brief tcl interpreter */
struct fbserv_listener fbs_listener; /**< @brief data for
listening */
struct fbserv_client fbs_clients[MAX_CLIENTS]; /**< @brief connected
clients */
void (*fbs_callback)(void *clientData); /**< @brief callback
function */
Modified: brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c
===================================================================
--- brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c 2020-04-22 05:43:00 UTC
(rev 75523)
+++ brlcad/branches/dm-fb-merge/src/libdm/fbserv_obj.c 2020-04-22 13:13:19 UTC
(rev 75524)
@@ -81,7 +81,7 @@
#if defined(_WIN32) && !defined(__CYGWIN__)
Tcl_DeleteChannelHandler(fbsp->fbs_clients[sub].fbsc_chan,
fbsp->fbs_clients[sub].fbsc_handler,
(ClientData)fbsp->fbs_clients[sub].fbsc_fd);
- Tcl_Close(fbsp->fbs_interp, fbsp->fbs_clients[sub].fbsc_chan);
+ Tcl_Close((Tcl_Interp *)fbsp->fbs_interp,
fbsp->fbs_clients[sub].fbsc_chan);
fbsp->fbs_clients[sub].fbsc_chan = NULL;
#else
Tcl_DeleteFileHandler(fbsp->fbs_clients[sub].fbsc_fd);
@@ -1020,12 +1020,12 @@
* Hang an unending listen for PKG connections
*/
#if defined(_WIN32) && !defined(__CYGWIN__)
- fbsp->fbs_listener.fbsl_chan = Tcl_OpenTcpServer(fbsp->fbs_interp,
available_port, hostname, new_client_handler, (ClientData)&fbsp->fbs_listener);
+ fbsp->fbs_listener.fbsl_chan = Tcl_OpenTcpServer((Tcl_Interp
*)fbsp->fbs_interp, available_port, hostname, new_client_handler,
(ClientData)&fbsp->fbs_listener);
if (fbsp->fbs_listener.fbsl_chan == NULL) {
/* This clobbers the result string which probably has junk
* related to the failed open.
*/
- Tcl_DStringResult(fbsp->fbs_interp, &ds);
+ Tcl_DStringResult((Tcl_Interp *)fbsp->fbs_interp, &ds);
} else {
break;
}
@@ -1052,7 +1052,7 @@
if (failed) {
bu_vls_printf(&vls, "fbs_open: failed to hang a listen on ports %d -
%d\n", port, available_port);
- Tcl_AppendResult(fbsp->fbs_interp, bu_vls_addr(&vls), (char *)NULL);
+ Tcl_AppendResult((Tcl_Interp *)fbsp->fbs_interp, bu_vls_addr(&vls),
(char *)NULL);
bu_vls_free(&vls);
fbsp->fbs_listener.fbsl_port = -1;
@@ -1085,7 +1085,7 @@
if (fbsp->fbs_listener.fbsl_chan != NULL) {
Tcl_ChannelProc *callback = (Tcl_ChannelProc *)new_client_handler;
Tcl_DeleteChannelHandler(fbsp->fbs_listener.fbsl_chan, callback,
(ClientData)fbsp->fbs_listener.fbsl_fd);
- Tcl_Close(fbsp->fbs_interp, fbsp->fbs_listener.fbsl_chan);
+ Tcl_Close((Tcl_Interp *)fbsp->fbs_interp, fbsp->fbs_listener.fbsl_chan);
fbsp->fbs_listener.fbsl_chan = NULL;
}
#else
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
