Revision: 75728
http://sourceforge.net/p/brlcad/code/75728
Author: starseeker
Date: 2020-05-07 16:17:26 +0000 (Thu, 07 May 2020)
Log Message:
-----------
Merge from trunk through r75727
Modified Paths:
--------------
brlcad/branches/bioh/CMakeLists.txt
brlcad/branches/bioh/src/libbu/tests/dylib/run.c
brlcad/branches/bioh/src/other/libregex/regex.h.in
Property Changed:
----------------
brlcad/branches/bioh/
brlcad/branches/bioh/src/libbu/
brlcad/branches/bioh/src/other/
brlcad/branches/bioh/src/other/libregex/
Index: brlcad/branches/bioh
===================================================================
--- brlcad/branches/bioh 2020-05-07 15:11:51 UTC (rev 75727)
+++ brlcad/branches/bioh 2020-05-07 16:17:26 UTC (rev 75728)
Property changes on: brlcad/branches/bioh
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,5 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/branches/tcltk86:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86:68300-75257
+/brlcad/trunk:75720-75727
\ No newline at end of property
Modified: brlcad/branches/bioh/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/CMakeLists.txt 2020-05-07 15:11:51 UTC (rev 75727)
+++ brlcad/branches/bioh/CMakeLists.txt 2020-05-07 16:17:26 UTC (rev 75728)
@@ -1106,10 +1106,10 @@
# OpenBSD doesn't define __WORD_SIZE
if(${CMAKE_WORD_SIZE} MATCHES "32BIT")
- CONFIG_H_APPEND(BRLCAD "#ifndef __WORD_SIZE\n# define __WORD_SIZE
32\n#endif\n")
+ CONFIG_H_APPEND(BRLCAD "#ifndef __WORDSIZE\n# define __WORDSIZE
32\n#endif\n")
endif(${CMAKE_WORD_SIZE} MATCHES "32BIT")
if(${CMAKE_WORD_SIZE} MATCHES "64BIT")
- CONFIG_H_APPEND(BRLCAD "#ifndef __WORD_SIZE\n# define __WORD_SIZE
64\n#endif\n")
+ CONFIG_H_APPEND(BRLCAD "#ifndef __WORDSIZE\n# define __WORDSIZE
64\n#endif\n")
endif(${CMAKE_WORD_SIZE} MATCHES "64BIT")
# Based on what we are doing, we may need to constrain our search paths
Index: brlcad/branches/bioh/src/libbu
===================================================================
--- brlcad/branches/bioh/src/libbu 2020-05-07 15:11:51 UTC (rev 75727)
+++ brlcad/branches/bioh/src/libbu 2020-05-07 16:17:26 UTC (rev 75728)
Property changes on: brlcad/branches/bioh/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454
/brlcad/branches/brep-debug/src/libbu:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
-/brlcad/branches/tcltk86/src/libbu:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86/src/libbu:68300-75257
+/brlcad/trunk/src/libbu:75720-75727
\ No newline at end of property
Modified: brlcad/branches/bioh/src/libbu/tests/dylib/run.c
===================================================================
--- brlcad/branches/bioh/src/libbu/tests/dylib/run.c 2020-05-07 15:11:51 UTC
(rev 75727)
+++ brlcad/branches/bioh/src/libbu/tests/dylib/run.c 2020-05-07 16:17:26 UTC
(rev 75728)
@@ -27,6 +27,8 @@
(void)dylib_close_plugins(&handles);
bu_ptbl_free(&handles);
return -1;
+ } else {
+ bu_log("Found %d plugins.\n", pcnt);
}
int expected_results = 1;
@@ -38,6 +40,8 @@
if (!NEAR_EQUAL(p->version, eversion, SMALL_FASTF)) {
bu_log("%s: expected version %f plugins, found %f.\n", p->name,
eversion, p->version);
expected_results = 0;
+ } else {
+ bu_log("%s: got expected plugin version: %f.\n", p->name,
p->version);
}
int rstr_len = 10;
char *cresult = (char *)bu_calloc(rstr_len, sizeof(char), "result
buffer");
@@ -50,6 +54,8 @@
if (!BU_STR_EQUAL(cresult, ecalc)) {
bu_log("%s: expected to calculate %s, got %s.\n", p->name,
ecalc, cresult);
expected_results = 0;
+ } else {
+ bu_log("%s: got expected result: %s.\n", p->name, cresult);
}
bu_free(cresult, "result container");
}
@@ -71,6 +77,8 @@
if (!BU_STR_EQUAL(cresult, ecalc)) {
bu_log("%s: expected to calculate %s, got %s.\n", p->name,
ecalc, cresult);
expected_results = 0;
+ } else {
+ bu_log("%s: got expected result: %s.\n", p->name, cresult);
}
bu_free(cresult, "result container");
}
Index: brlcad/branches/bioh/src/other
===================================================================
--- brlcad/branches/bioh/src/other 2020-05-07 15:11:51 UTC (rev 75727)
+++ brlcad/branches/bioh/src/other 2020-05-07 16:17:26 UTC (rev 75728)
Property changes on: brlcad/branches/bioh/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,5 ##
/brlcad/branches/opencl/src/other:65867-66137
/brlcad/branches/osg/src/other:62110-62113
/brlcad/branches/prep-cache/src/other:68236-68933
-/brlcad/branches/tcltk86/src/other:68300-75257
\ No newline at end of property
+/brlcad/branches/tcltk86/src/other:68300-75257
+/brlcad/trunk/src/other:75720-75727
\ No newline at end of property
Index: brlcad/branches/bioh/src/other/libregex
===================================================================
--- brlcad/branches/bioh/src/other/libregex 2020-05-07 15:11:51 UTC (rev
75727)
+++ brlcad/branches/bioh/src/other/libregex 2020-05-07 16:17:26 UTC (rev
75728)
Property changes on: brlcad/branches/bioh/src/other/libregex
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,5 ##
/brlcad/branches/osg/src/other/libregex:62110-62113
/brlcad/branches/prep-cache/src/other/libregex:68236-68933
/brlcad/branches/tcltk86/src/other/libregex:68300-75257
-/brlcad/branches/thirdparty_rework/src/other/libregex:75102-75103
\ No newline at end of property
+/brlcad/branches/thirdparty_rework/src/other/libregex:75102-75103
+/brlcad/trunk/src/other/libregex:75720-75727
\ No newline at end of property
Modified: brlcad/branches/bioh/src/other/libregex/regex.h.in
===================================================================
--- brlcad/branches/bioh/src/other/libregex/regex.h.in 2020-05-07 15:11:51 UTC
(rev 75727)
+++ brlcad/branches/bioh/src/other/libregex/regex.h.in 2020-05-07 16:17:26 UTC
(rev 75728)
@@ -85,16 +85,18 @@
#endif
-#ifdef __cplusplus
-# define __BEGIN_DECLS extern "C" {
-# define __END_DECLS }
-#else
-# ifndef __BEGIN_DECLS
-# define __BEGIN_DECLS
- #endif
-# ifndef __END_DECLS
-# define __END_DECLS
-# endif
+#ifndef __BEGIN_DECLS
+# ifdef __cplusplus
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+# else
+# ifndef __BEGIN_DECLS
+# define __BEGIN_DECLS
+# endif
+# ifndef __END_DECLS
+# define __END_DECLS
+# endif
+# endif
#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
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
