[brlcad-commits] SF.net SVN: brlcad:[69705] brlcad/trunk/src/external/CREO
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2017-04-24 23:43:55
|
Revision: 69705 http://sourceforge.net/p/brlcad/code/69705 Author: brlcad Date: 2017-04-24 23:43:52 +0000 (Mon, 24 Apr 2017) Log Message: ----------- after a little sleuthing, looks like they are arrays, so change the shim instead Modified Paths: -------------- brlcad/trunk/src/external/CREO/main.cpp brlcad/trunk/src/external/CREO/shim.h brlcad/trunk/src/external/CREO/util.cpp Modified: brlcad/trunk/src/external/CREO/main.cpp =================================================================== --- brlcad/trunk/src/external/CREO/main.cpp 2017-04-24 23:39:22 UTC (rev 69704) +++ brlcad/trunk/src/external/CREO/main.cpp 2017-04-24 23:43:52 UTC (rev 69705) @@ -376,7 +376,7 @@ ProError status; ProMdl model; ProMdlType type; - ProLine tmp_line = NULL; + ProLine tmp_line = {'\0'}; wchar_t *tmp_str; int n_selected_names; char **selected_names; @@ -926,7 +926,7 @@ } /* add a menu item that runs the new command */ - ProFileName msgfil = NULL; + ProFileName msgfil = {'\0'}; ProStringToWstring(msgfil, CREO_BRL_MSG_FILE); status = ProMenubarmenuPushbuttonAdd( "File", "CREO-BRL", "CREO-BRL", "CREO-BRL-HELP", "File.psh_exit", PRO_B_FALSE, cmd_id, msgfil ); if ( status != PRO_TK_NO_ERROR ) { Modified: brlcad/trunk/src/external/CREO/shim.h =================================================================== --- brlcad/trunk/src/external/CREO/shim.h 2017-04-24 23:39:22 UTC (rev 69704) +++ brlcad/trunk/src/external/CREO/shim.h 2017-04-24 23:43:52 UTC (rev 69705) @@ -120,8 +120,8 @@ typedef void* ProUnitsystem; typedef void* ProValue; typedef void* ProWVerstamp; -typedef wchar_t* ProFileName; -typedef wchar_t* ProLine; +typedef wchar_t ProFileName[1]; +typedef wchar_t ProLine[1]; /* Definitions where we need to provide internal structure * (because our code is accessing it) */ Modified: brlcad/trunk/src/external/CREO/util.cpp =================================================================== --- brlcad/trunk/src/external/CREO/util.cpp 2017-04-24 23:39:22 UTC (rev 69704) +++ brlcad/trunk/src/external/CREO/util.cpp 2017-04-24 23:43:52 UTC (rev 69705) @@ -70,7 +70,7 @@ * in multi-threading situations... - probably can't use libbu's logging safely */ /* CREO gui */ - ProFileName msgfil = NULL; + ProFileName msgfil = {'\0'}; ProStringToWstring(msgfil, CREO_BRL_MSG_FILE); /* Can't do nested variable argument functions, so printf the message here */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |