[brlcad-commits] SF.net SVN: brlcad:[76653] brlcad/trunk/src/libtclcad/tclcad_obj.c

[starseeker--- via brlcad-commits]

Revision: 76653
          http://sourceforge.net/p/brlcad/code/76653
Author:   starseeker
Date:     2020-08-03 17:56:27 +0000 (Mon, 03 Aug 2020)
Log Message:
-----------
Fix libtclcad build on Windows

Modified Paths:
--------------
    brlcad/trunk/src/libtclcad/tclcad_obj.c

Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c     2020-08-03 16:55:53 UTC (rev 
76652)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c     2020-08-03 17:56:27 UTC (rev 
76653)
@@ -51,6 +51,7 @@
 #include "bn.h"
 #include "bu/cmd.h"
 #include "bu/path.h"
+#include "bu/process.h"
 #include "bu/units.h"
 #include "vmath.h"
 #include "rt/db4.h"
@@ -1205,7 +1206,7 @@
 
 #else
 void
-tclcad_create_io_handler(struct ged_subprocess *p, int fd, 
ged_io_handler_callback_t callback, void *data)
+tclcad_create_io_handler(struct ged_subprocess *p, int fd, ged_io_func_t 
callback, void *data)
 {
     if (!p || !p->p || !p->gedp || !p->gedp->ged_io_data)
                return;
@@ -1212,8 +1213,8 @@
     struct tclcad_io_data *t_iod = (struct tclcad_io_data 
*)p->gedp->ged_io_data;
     HANDLE *fdp = (HANDLE *)bu_process_fd(p->p, fd);
     if (fdp) {
-       (*t_iod->chan) = (void *)Tcl_MakeFileChannel(*fdp, t_iod->io_mode);
-       Tcl_CreateChannelHandler(*t_iod->chan, t_iod->io_mode, callback, 
(ClientData)data);
+       t_iod->chan = Tcl_MakeFileChannel(*fdp, t_iod->io_mode);
+       Tcl_CreateChannelHandler(t_iod->chan, t_iod->io_mode, callback, 
(ClientData)data);
     }
 }
 
@@ -1220,11 +1221,11 @@
 void
 tclcad_delete_io_handler(struct ged_subprocess *p, int fd)
 {
-    if (!p || !p->p || !p->p->gedp || !p->p->gedp->ged_io_data)
+    if (!p || !p->p || !p->gedp || !p->gedp->ged_io_data)
                return;
     struct tclcad_io_data *t_iod = (struct tclcad_io_data 
*)p->gedp->ged_io_data;
-    Tcl_DeleteChannelHandler(t_oid->chan, NULL, (ClientData)NULL);
-    Tcl_Close(t_oid->interp, t_oid->chan);
+    Tcl_DeleteChannelHandler(t_iod->chan, NULL, (ClientData)NULL);
+    Tcl_Close(t_iod->interp, t_iod->chan);
 }
 #endif
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits