Merge branch 'main' into draw_rework

BRL-CAD · Jun 30, 2023 · e88ce8f · e88ce8f
2 parents e970d31 + f5de8fe
commit e88ce8f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/src/external/Creo/shim.cpp b/src/external/Creo/shim.cpp
@@ -21,7 +21,7 @@
 /* Functions */
 extern "C" int ProArrayAlloc(int,int,int,void**) {return 0;}
 extern "C" int ProArrayFree(void**) {return 0;}
-extern "C" int ProArrayObjectAdd(ProArray *, int, int, void*) {return 0;};
+extern "C" int ProArrayObjectAdd(ProArray *, int, int, void*) {return 0;}
 extern "C" int ProArraySizeGet(ProArray,int*) {return 0;}
 extern "C" int ProAsmcompMdlGet(ProFeature*,void**) {return 0;}
 extern "C" int ProAsmcompMdlMdlnameGet(ProFeature*,int*,wchar_t*) {return 0;}

diff --git a/src/other/ext/stepcode/src/express/expscan.l b/src/other/ext/stepcode/src/express/expscan.l
@@ -101,7 +101,7 @@
  *
  */
 #include <ctype.h>
-#ifndef isascii
+#if !defined(isascii) && defined(__isascii)
 #  define isascii __isascii
 #endif
 #include "express/basic.h"

diff --git a/src/other/ext/stepcode/src/express/generated/expscan.c b/src/other/ext/stepcode/src/express/generated/expscan.c
@@ -100,7 +100,7 @@
 * BPR 2.1 alpha
 * */
 #include <ctype.h>
-#ifndef isascii
+#if !defined(isascii) && defined(__isascii)
 #  define isascii __isascii
 #endif
 #include "express/basic.h"

diff --git a/src/other/tkhtml/src/htmltcl.c b/src/other/tkhtml/src/htmltcl.c
@@ -859,7 +859,7 @@ HtmlCallbackLayout (HtmlTree *pTree, HtmlNode *pNode)
 }
 
 static int 
-setSnapshotId (HtmlTree *pTree, HtmlNode *pNode, void *)
+setSnapshotId (HtmlTree *pTree, HtmlNode *pNode, void *d)
 {
     pNode->iSnapshot = pTree->iLastSnapshotId;
     return HTML_WALK_DESCEND;