Revision: 76789
http://sourceforge.net/p/brlcad/code/76789
Author: starseeker
Date: 2020-08-15 14:31:44 +0000 (Sat, 15 Aug 2020)
Log Message:
-----------
Merge from trunk: r76770 through r76788
Modified Paths:
--------------
brlcad/branches/RELEASE/CMakeLists.txt
brlcad/branches/RELEASE/include/bu/magic.h
brlcad/branches/RELEASE/include/bu/units.h
brlcad/branches/RELEASE/include/dm/defines.h
brlcad/branches/RELEASE/include/ged/defines.h
brlcad/branches/RELEASE/include/vmath.h
brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake
brlcad/branches/RELEASE/misc/repoconv/github_ci_actions.yml
brlcad/branches/RELEASE/src/libbu/units.c
brlcad/branches/RELEASE/src/libdm/X/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/dm_init.cpp
brlcad/branches/RELEASE/src/libdm/glx/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/osgl/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/plot/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/postscript/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/qt/CMakeLists.txt
brlcad/branches/RELEASE/src/libdm/wgl/CMakeLists.txt
brlcad/branches/RELEASE/src/libged/3ptarb/3ptarb.c
brlcad/branches/RELEASE/src/libged/adc/adc.c
brlcad/branches/RELEASE/src/libged/adjust/adjust.c
brlcad/branches/RELEASE/src/libged/ae2dir/ae2dir.c
brlcad/branches/RELEASE/src/libged/analyze/analyze.c
brlcad/branches/RELEASE/src/libged/annotate/annotate.c
brlcad/branches/RELEASE/src/libged/arb/arb.c
brlcad/branches/RELEASE/src/libged/arced/arced.c
brlcad/branches/RELEASE/src/libged/arot/arot.c
brlcad/branches/RELEASE/src/libged/attr/attr.cpp
brlcad/branches/RELEASE/src/libged/autoview/autoview.c
brlcad/branches/RELEASE/src/libged/bb/bb.c
brlcad/branches/RELEASE/src/libged/bev/bev.c
brlcad/branches/RELEASE/src/libged/bigE/bigE.c
brlcad/branches/RELEASE/src/libged/blast/blast.c
brlcad/branches/RELEASE/src/libged/bo/bo.c
brlcad/branches/RELEASE/src/libged/bot/bot.cpp
brlcad/branches/RELEASE/src/libged/brep/brep.cpp
brlcad/branches/RELEASE/src/libged/cat/cat.c
brlcad/branches/RELEASE/src/libged/cc/cc.c
brlcad/branches/RELEASE/src/libged/check/check.c
brlcad/branches/RELEASE/src/libged/clone/clone.c
brlcad/branches/RELEASE/src/libged/coil/coil.c
brlcad/branches/RELEASE/src/libged/color/color.c
brlcad/branches/RELEASE/src/libged/comb/comb.c
brlcad/branches/RELEASE/src/libged/comb_color/comb_color.c
brlcad/branches/RELEASE/src/libged/comb_std/comb_std.c
brlcad/branches/RELEASE/src/libged/combmem/combmem.c
brlcad/branches/RELEASE/src/libged/concat/concat.cpp
brlcad/branches/RELEASE/src/libged/constraint/constraint.c
brlcad/branches/RELEASE/src/libged/copy/copy.c
brlcad/branches/RELEASE/src/libged/copyeval/copyeval.c
brlcad/branches/RELEASE/src/libged/copymat/copymat.c
brlcad/branches/RELEASE/src/libged/cpi/cpi.c
brlcad/branches/RELEASE/src/libged/dag/dag.cpp
brlcad/branches/RELEASE/src/libged/dbip/dbip.c
brlcad/branches/RELEASE/src/libged/debug/debug.cpp
brlcad/branches/RELEASE/src/libged/debugbu/debugbu.c
brlcad/branches/RELEASE/src/libged/debugdir/debugdir.c
brlcad/branches/RELEASE/src/libged/debuglib/debuglib.c
brlcad/branches/RELEASE/src/libged/debugnmg/debugnmg.c
brlcad/branches/RELEASE/src/libged/decompose/decompose.c
brlcad/branches/RELEASE/src/libged/delay/delay.c
brlcad/branches/RELEASE/src/libged/dir2ae/dir2ae.c
brlcad/branches/RELEASE/src/libged/draw/draw.c
brlcad/branches/RELEASE/src/libged/dsp/dsp.c
brlcad/branches/RELEASE/src/libged/dump/dump.c
brlcad/branches/RELEASE/src/libged/dup/dup.c
brlcad/branches/RELEASE/src/libged/eac/eac.c
brlcad/branches/RELEASE/src/libged/echo/echo.c
brlcad/branches/RELEASE/src/libged/edarb/edarb.c
brlcad/branches/RELEASE/src/libged/edcodes/edcodes.c
brlcad/branches/RELEASE/src/libged/edcomb/edcomb.c
brlcad/branches/RELEASE/src/libged/edit/edit.c
brlcad/branches/RELEASE/src/libged/editit/editit.c
brlcad/branches/RELEASE/src/libged/edmater/edmater.c
brlcad/branches/RELEASE/src/libged/env/env.c
brlcad/branches/RELEASE/src/libged/erase/erase.c
brlcad/branches/RELEASE/src/libged/exists/exists.c
brlcad/branches/RELEASE/src/libged/expand/expand.c
brlcad/branches/RELEASE/src/libged/eye_pos/eye_pos.c
brlcad/branches/RELEASE/src/libged/facetize/facetize.cpp
brlcad/branches/RELEASE/src/libged/fb2pix/fb2pix.c
brlcad/branches/RELEASE/src/libged/fbclear/fbclear.c
brlcad/branches/RELEASE/src/libged/find/find.c
brlcad/branches/RELEASE/src/libged/form/form.c
brlcad/branches/RELEASE/src/libged/fracture/fracture.c
brlcad/branches/RELEASE/src/libged/gdiff/gdiff.c
brlcad/branches/RELEASE/src/libged/ged.c
brlcad/branches/RELEASE/src/libged/ged_init.cpp
brlcad/branches/RELEASE/src/libged/get/get.c
brlcad/branches/RELEASE/src/libged/get_autoview/get_autoview.c
brlcad/branches/RELEASE/src/libged/get_comb/get_comb.c
brlcad/branches/RELEASE/src/libged/get_eyemodel/get_eyemodel.c
brlcad/branches/RELEASE/src/libged/get_type/get_type.c
brlcad/branches/RELEASE/src/libged/glob/glob.c
brlcad/branches/RELEASE/src/libged/gqa/gqa.c
brlcad/branches/RELEASE/src/libged/grid/grid.c
brlcad/branches/RELEASE/src/libged/grid2model_lu/grid2model_lu.c
brlcad/branches/RELEASE/src/libged/grid2view_lu/grid2view_lu.c
brlcad/branches/RELEASE/src/libged/group/group.c
brlcad/branches/RELEASE/src/libged/heal/heal.c
brlcad/branches/RELEASE/src/libged/help/help.cpp
brlcad/branches/RELEASE/src/libged/hide/hide.c
brlcad/branches/RELEASE/src/libged/how/how.c
brlcad/branches/RELEASE/src/libged/human/human.c
brlcad/branches/RELEASE/src/libged/illum/illum.c
brlcad/branches/RELEASE/src/libged/importFg4Section/importFg4Section.c
brlcad/branches/RELEASE/src/libged/include/plugin.h
brlcad/branches/RELEASE/src/libged/inside/inside.c
brlcad/branches/RELEASE/src/libged/instance/instance.c
brlcad/branches/RELEASE/src/libged/isize/isize.c
brlcad/branches/RELEASE/src/libged/item/item.c
brlcad/branches/RELEASE/src/libged/joint/joint.c
brlcad/branches/RELEASE/src/libged/joint2/joint2.c
brlcad/branches/RELEASE/src/libged/keep/keep.c
brlcad/branches/RELEASE/src/libged/keypoint/keypoint.c
brlcad/branches/RELEASE/src/libged/kill/kill.c
brlcad/branches/RELEASE/src/libged/killall/killall.c
brlcad/branches/RELEASE/src/libged/killrefs/killrefs.c
brlcad/branches/RELEASE/src/libged/killtree/killtree.c
brlcad/branches/RELEASE/src/libged/label/label.c
brlcad/branches/RELEASE/src/libged/lc/lc.c
brlcad/branches/RELEASE/src/libged/libfuncs/libfuncs.c
brlcad/branches/RELEASE/src/libged/lint/lint.cpp
brlcad/branches/RELEASE/src/libged/list/list.c
brlcad/branches/RELEASE/src/libged/lod/lod.c
brlcad/branches/RELEASE/src/libged/log/log.c
brlcad/branches/RELEASE/src/libged/lookat/lookat.c
brlcad/branches/RELEASE/src/libged/ls/ls.c
brlcad/branches/RELEASE/src/libged/lt/lt.c
brlcad/branches/RELEASE/src/libged/m2v_point/m2v_point.c
brlcad/branches/RELEASE/src/libged/make/make.c
brlcad/branches/RELEASE/src/libged/make_name/make_name.c
brlcad/branches/RELEASE/src/libged/match/match.c
brlcad/branches/RELEASE/src/libged/mater/mater.cpp
brlcad/branches/RELEASE/src/libged/metaball/metaball.c
brlcad/branches/RELEASE/src/libged/mirror/mirror.c
brlcad/branches/RELEASE/src/libged/model2grid_lu/model2grid_lu.c
brlcad/branches/RELEASE/src/libged/model2view/model2view.c
brlcad/branches/RELEASE/src/libged/model2view_lu/model2view_lu.c
brlcad/branches/RELEASE/src/libged/move/move.c
brlcad/branches/RELEASE/src/libged/move_all/move_all.c
brlcad/branches/RELEASE/src/libged/move_arb_edge/move_arb_edge.c
brlcad/branches/RELEASE/src/libged/move_arb_face/move_arb_face.c
brlcad/branches/RELEASE/src/libged/mrot/mrot.c
brlcad/branches/RELEASE/src/libged/nirt/nirt.c
brlcad/branches/RELEASE/src/libged/nmg/nmg.c
brlcad/branches/RELEASE/src/libged/ocenter/ocenter.c
brlcad/branches/RELEASE/src/libged/open/open.c
brlcad/branches/RELEASE/src/libged/orient/orient.c
brlcad/branches/RELEASE/src/libged/orotate/orotate.c
brlcad/branches/RELEASE/src/libged/oscale/oscale.c
brlcad/branches/RELEASE/src/libged/otranslate/otranslate.c
brlcad/branches/RELEASE/src/libged/overlay/overlay.c
brlcad/branches/RELEASE/src/libged/pathlist/pathlist.c
brlcad/branches/RELEASE/src/libged/pathsum/pathsum.c
brlcad/branches/RELEASE/src/libged/perspective/perspective.c
brlcad/branches/RELEASE/src/libged/pipe/pipe.c
brlcad/branches/RELEASE/src/libged/pix2fb/pix2fb.c
brlcad/branches/RELEASE/src/libged/plot/plot.c
brlcad/branches/RELEASE/src/libged/pmat/pmat.c
brlcad/branches/RELEASE/src/libged/pmodel2view/pmodel2view.c
brlcad/branches/RELEASE/src/libged/png/png.c
brlcad/branches/RELEASE/src/libged/png2fb/png2fb.c
brlcad/branches/RELEASE/src/libged/pnts/pnts.cpp
brlcad/branches/RELEASE/src/libged/prcolor/prcolor.c
brlcad/branches/RELEASE/src/libged/prefix/prefix.c
brlcad/branches/RELEASE/src/libged/process/process.c
brlcad/branches/RELEASE/src/libged/protate/protate.c
brlcad/branches/RELEASE/src/libged/ps/ps.c
brlcad/branches/RELEASE/src/libged/pscale/pscale.c
brlcad/branches/RELEASE/src/libged/pset/pset.c
brlcad/branches/RELEASE/src/libged/ptranslate/ptranslate.c
brlcad/branches/RELEASE/src/libged/pull/pull.c
brlcad/branches/RELEASE/src/libged/push/push.c
brlcad/branches/RELEASE/src/libged/put/put.c
brlcad/branches/RELEASE/src/libged/put_comb/put_comb.c
brlcad/branches/RELEASE/src/libged/putmat/putmat.c
brlcad/branches/RELEASE/src/libged/qray/qray.c
brlcad/branches/RELEASE/src/libged/qvrot/qvrot.c
brlcad/branches/RELEASE/src/libged/rcodes/rcodes.c
brlcad/branches/RELEASE/src/libged/rect/rect.c
brlcad/branches/RELEASE/src/libged/red/red.c
brlcad/branches/RELEASE/src/libged/regdef/regdef.c
brlcad/branches/RELEASE/src/libged/region/region.c
brlcad/branches/RELEASE/src/libged/remove/remove.c
brlcad/branches/RELEASE/src/libged/rfarb/rfarb.c
brlcad/branches/RELEASE/src/libged/rmap/rmap.c
brlcad/branches/RELEASE/src/libged/rmat/rmat.c
brlcad/branches/RELEASE/src/libged/rmater/rmater.c
brlcad/branches/RELEASE/src/libged/rot/rot.c
brlcad/branches/RELEASE/src/libged/rot_point/rot_point.c
brlcad/branches/RELEASE/src/libged/rrt/rrt.c
brlcad/branches/RELEASE/src/libged/rt/rt.c
brlcad/branches/RELEASE/src/libged/rtabort/rtabort.c
brlcad/branches/RELEASE/src/libged/rtcheck/rtcheck.c
brlcad/branches/RELEASE/src/libged/rtwizard/rtwizard.c
brlcad/branches/RELEASE/src/libged/savekey/savekey.c
brlcad/branches/RELEASE/src/libged/saveview/saveview.c
brlcad/branches/RELEASE/src/libged/scale/scale.c
brlcad/branches/RELEASE/src/libged/screengrab/screengrab.c
brlcad/branches/RELEASE/src/libged/search/search.c
brlcad/branches/RELEASE/src/libged/select/select.c
brlcad/branches/RELEASE/src/libged/set_output_script/set_output_script.c
brlcad/branches/RELEASE/src/libged/set_transparency/set_transparency.c
brlcad/branches/RELEASE/src/libged/set_uplotOutputMode/set_uplotOutputMode.c
brlcad/branches/RELEASE/src/libged/setview/setview.c
brlcad/branches/RELEASE/src/libged/shaded_mode/shaded_mode.c
brlcad/branches/RELEASE/src/libged/shader/shader.c
brlcad/branches/RELEASE/src/libged/shells/shells.c
brlcad/branches/RELEASE/src/libged/showmats/showmats.c
brlcad/branches/RELEASE/src/libged/simulate/ged_command.cpp
brlcad/branches/RELEASE/src/libged/slew/slew.c
brlcad/branches/RELEASE/src/libged/solid_report/solid_report.c
brlcad/branches/RELEASE/src/libged/solids_on_ray/solids_on_ray.c
brlcad/branches/RELEASE/src/libged/sphgroup/sphgroup.c
brlcad/branches/RELEASE/src/libged/summary/summary.c
brlcad/branches/RELEASE/src/libged/sync/sync.c
brlcad/branches/RELEASE/src/libged/tables/tables.c
brlcad/branches/RELEASE/src/libged/tire/tire.c
brlcad/branches/RELEASE/src/libged/title/title.c
brlcad/branches/RELEASE/src/libged/tol/tol.c
brlcad/branches/RELEASE/src/libged/tops/tops.c
brlcad/branches/RELEASE/src/libged/tra/tra.c
brlcad/branches/RELEASE/src/libged/track/track.c
brlcad/branches/RELEASE/src/libged/tree/tree.c
brlcad/branches/RELEASE/src/libged/typein/typein.c
brlcad/branches/RELEASE/src/libged/unhide/unhide.c
brlcad/branches/RELEASE/src/libged/units/units.c
brlcad/branches/RELEASE/src/libged/v2m_point/v2m_point.c
brlcad/branches/RELEASE/src/libged/vdraw/vdraw.c
brlcad/branches/RELEASE/src/libged/version/version.c
brlcad/branches/RELEASE/src/libged/view/view.c
brlcad/branches/RELEASE/src/libged/view2grid_lu/view2grid_lu.c
brlcad/branches/RELEASE/src/libged/view2model/view2model.c
brlcad/branches/RELEASE/src/libged/view2model_lu/view2model_lu.c
brlcad/branches/RELEASE/src/libged/view2model_vec/view2model_vec.c
brlcad/branches/RELEASE/src/libged/viewdir/viewdir.c
brlcad/branches/RELEASE/src/libged/voxelize/voxelize.c
brlcad/branches/RELEASE/src/libged/vrot/vrot.c
brlcad/branches/RELEASE/src/libged/wcodes/wcodes.c
brlcad/branches/RELEASE/src/libged/whatid/whatid.c
brlcad/branches/RELEASE/src/libged/which/which.cpp
brlcad/branches/RELEASE/src/libged/which_shader/which_shader.c
brlcad/branches/RELEASE/src/libged/who/who.c
brlcad/branches/RELEASE/src/libged/wmater/wmater.c
brlcad/branches/RELEASE/src/libged/xpush/xpush.c
brlcad/branches/RELEASE/src/libged/zap/zap.c
brlcad/branches/RELEASE/src/libged/zoom/zoom.c
brlcad/branches/RELEASE/src/mged/color_scheme.c
Property Changed:
----------------
brlcad/branches/RELEASE/
brlcad/branches/RELEASE/include/
brlcad/branches/RELEASE/src/libbu/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE 2020-08-15 14:31:44 UTC (rev 76789)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76768,76771-76788
\ No newline at end of property
Modified: brlcad/branches/RELEASE/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/CMakeLists.txt 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/CMakeLists.txt 2020-08-15 14:31:44 UTC (rev
76789)
@@ -3624,6 +3624,12 @@
CMAKEFILES(.gitignore)
endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitignore)
+ # List any files which may exist for CI testing for distcheck. TODO -
+ # this should be a fixed list, but until we go live with the Git repo
+ # use file(GLOB_RECURSE) instead
+ file(GLOB_RECURSE GITHUB_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
".github/*")
+ CMAKEFILES(${GITHUB_FILES})
+
# Handle some toplevel distclean listings
DISTCLEAN("${CMAKE_BINARY_DIR}/CMakeCache.txt")
DISTCLEAN("${CMAKE_BINARY_DIR}/cmakefiles.cmake")
Index: brlcad/branches/RELEASE/include
===================================================================
--- brlcad/branches/RELEASE/include 2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/include 2020-08-15 14:31:44 UTC (rev 76789)
Property changes on: brlcad/branches/RELEASE/include
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/include:65867-66137
/brlcad/branches/osg/include:62110-62113
/brlcad/branches/prep-cache/include:68236-68933
-/brlcad/trunk/include:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76726,76729-76730,76748-76764
\ No newline at end of property
+/brlcad/trunk/include:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-75207,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549,75565-75566,75656-75661,75672,75675,75678,75729,75811,76641-76726,76729-76730,76748-76764,76771-76788
\ No newline at end of property
Modified: brlcad/branches/RELEASE/include/bu/magic.h
===================================================================
--- brlcad/branches/RELEASE/include/bu/magic.h 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/include/bu/magic.h 2020-08-15 14:31:44 UTC (rev
76789)
@@ -241,7 +241,11 @@
# define BU_CKMAG(_ptr, _magic, _str) (void)(_ptr)
#else
# define BU_CKMAG(_ptr, _magic, _str) do { \
- if (UNLIKELY(((uintptr_t)(_ptr) == 0) || ((uintptr_t)(_ptr) &
(sizeof((uintptr_t)(_ptr))-1)) || *((const uint32_t *)(_ptr)) !=
(uint32_t)(_magic))) { \
+ if (UNLIKELY(( (!(_ptr)) /* non-NULL pointer */ \
+ || ((uintptr_t)(_ptr) == 0) /* non-zero pointer */ \
+ || ((uintptr_t)(_ptr) & (sizeof((uintptr_t)(_ptr))-1)) /*
aligned ptr */ \
+ || (*((const uint32_t *)(_ptr)) != (uint32_t)(_magic)) /*
matches value */ \
+ ))) { \
bu_badmagic((const uint32_t *)(_ptr), (uint32_t)(_magic), _str,
__FILE__, __LINE__); \
} \
} while (0)
Modified: brlcad/branches/RELEASE/include/bu/units.h
===================================================================
--- brlcad/branches/RELEASE/include/bu/units.h 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/include/bu/units.h 2020-08-15 14:31:44 UTC (rev
76789)
@@ -37,21 +37,26 @@
/** @file bu/units.h */
/**
- * Given a string representation of a unit of distance (e.g., "feet"),
- * return the multiplier which will convert that unit into the default
- * unit for the dimension (millimeters for length, mm^3 for volume,
- * and grams for mass.)
+ * Convert the provided string into a units conversion factor.
*
+ * Given a string for a unit of length (e.g., "feet", "yd"), volume
+ * (e.g., "cm^3", "cu yards"), or mass (e.g., "kg", "grain", or "oz")
+ * return the multiplier (aka conversion factor) that converts the
+ * unit into the default (millimeters for length, mm^3 for volume, and
+ * grams for mass.) Values may be optionally specified with the unit
+ * (e.g., "5ft") to get the conversion factor for a particular
+ * quantity.
+ *
* Returns 0.0 on error and >0.0 on success
*/
BU_EXPORT extern double bu_units_conversion(const char *str);
+
/**
* Given a conversion factor to mm, search the table to find what unit
* this represents.
*
- * To accommodate floating point fuzz, a "near miss" is allowed. The
- * algorithm depends on the table being sorted small-to-large.
+ * To accommodate floating point fuzz, a "near miss" is allowed.
*
* Returns -
* char* units string
@@ -58,8 +63,12 @@
* NULL No known unit matches this conversion factor.
*/
BU_EXPORT extern const char *bu_units_string(const double mm);
+
+
+/** undocumented */
BU_EXPORT extern struct bu_vls *bu_units_strings_vls(void);
+
/**
* Given a conversion factor to mm, search the table to find the
* closest matching unit.
@@ -70,6 +79,7 @@
*/
BU_EXPORT extern const char *bu_nearest_units_string(const double mm);
+
/**
* Given a string of the form "25cm" or "5.2ft" returns the
* corresponding distance in mm.
@@ -80,6 +90,7 @@
*/
BU_EXPORT extern double bu_mm_value(const char *s);
+
/**
* Used primarily as a hooked function for bu_structparse tables to
* allow input of floating point values in other units.
@@ -102,6 +113,7 @@
#define BU_HN_GETSCALE 0x10
#define BU_HN_AUTOSCALE 0x20
+
/**
* Convert digital sizes to human readable form. Based off the
* BSD function humanize_number(3).
@@ -113,6 +125,7 @@
*/
BU_EXPORT extern int bu_humanize_number(char *buf, size_t len, int64_t
quotient, const char *suffix, size_t scale, int flags);
+
/*
* Converts the number given in 'str', which may be given in a humanized
* form (as described in BSD's humanize_number(3), but with some limitations),
Modified: brlcad/branches/RELEASE/include/dm/defines.h
===================================================================
--- brlcad/branches/RELEASE/include/dm/defines.h 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/include/dm/defines.h 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -59,7 +59,7 @@
};
struct dm_plugin {
- uint32_t api_version;
+ uint32_t api_version; /* must be first in struct */
const struct dm * const p;
};
Modified: brlcad/branches/RELEASE/include/ged/defines.h
===================================================================
--- brlcad/branches/RELEASE/include/ged/defines.h 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/include/ged/defines.h 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -328,6 +328,7 @@
};
struct ged_plugin {
+ uint32_t api_version;
const struct ged_cmd ** const cmds;
int cmd_cnt;
};
Modified: brlcad/branches/RELEASE/include/vmath.h
===================================================================
--- brlcad/branches/RELEASE/include/vmath.h 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/include/vmath.h 2020-08-15 14:31:44 UTC (rev
76789)
@@ -490,8 +490,6 @@
/**
* Return truthfully whether a value is within a minimum
* representation tolerance from zero.
- *
- * Use not recommended due to compilation-variant tolerance.
*/
#define ZERO(_a) NEAR_ZERO((_a), SMALL_FASTF)
@@ -498,8 +496,6 @@
/**
* Return truthfully whether a vector is within a minimum
* representation tolerance from zero.
- *
- * Use not recommended due to compilation-variant tolerance.
*/
#define VZERO(_a) VNEAR_ZERO((_a), SMALL_FASTF)
@@ -506,8 +502,6 @@
/**
* Return truthfully whether a 2d vector is within a minimum
* representation tolerance from zero.
- *
- * Use not recommended due to compilation-variant tolerance.
*/
#define V2ZERO(_a) V2NEAR_ZERO((_a), SMALL_FASTF)
@@ -514,8 +508,6 @@
/**
* Return truthfully whether a homogenized 4-element vector is within
* a minimum representation tolerance from zero.
- *
- * Use not recommended due to compilation-variant tolerance.
*/
#define HZERO(_a) HNEAR_ZERO((_a), SMALL_FASTF)
@@ -556,8 +548,6 @@
/**
* Return truthfully whether two values are within a minimum
* representation tolerance from each other.
- *
- * Use not recommended due to compilation-variant tolerance.
*/
#define EQUAL(_a, _b) NEAR_EQUAL((_a), (_b), SMALL_FASTF)
@@ -565,8 +555,6 @@
/**
* Return truthfully whether two vectors are equal within a minimum
* representation tolerance.
- *
- * Use not recommended due to compilation-variant tolerance.
*/
#define VEQUAL(_a, _b) VNEAR_EQUAL((_a), (_b), SMALL_FASTF)
Modified: brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake 2020-08-15
14:31:44 UTC (rev 76789)
@@ -270,6 +270,9 @@
# CMake flags to add_library/add_executable aren't going to be valid
filenames - just
# yank them up front.
set(ITEMS ${ARGN})
+ if (NOT ITEMS)
+ return()
+ endif (NOT ITEMS)
list(REMOVE_ITEM ITEMS SHARED STATIC OBJECT WIN32 UNKNOWN IMPORTED MODULE
INTERFACE EXCLUDE_FROM_ALL)
# TODO - once we require a new enough CMake version, replace the foreach
below with list(FILTER ...)
foreach(ITEM ${ITEMS})
Modified: brlcad/branches/RELEASE/misc/repoconv/github_ci_actions.yml
===================================================================
--- brlcad/branches/RELEASE/misc/repoconv/github_ci_actions.yml 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/misc/repoconv/github_ci_actions.yml 2020-08-15
14:31:44 UTC (rev 76789)
@@ -135,7 +135,8 @@
if ("${{ runner.os }}" STREQUAL "Windows")
execute_process(
- COMMAND cmake --build build --config Release --target
distcheck-enableall_release
+ COMMAND cmake --build build --config Release --target ALL_BUILD
+ COMMAND cmake --build build --config Release --target check
RESULT_VARIABLE result
)
else ("${{ runner.os }}" STREQUAL "Windows")
Index: brlcad/branches/RELEASE/src/libbu
===================================================================
--- brlcad/branches/RELEASE/src/libbu 2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libbu 2020-08-15 14:31:44 UTC (rev 76789)
Property changes on: brlcad/branches/RELEASE/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/brlcad/branches/bioh/src/libbu:75720-75728
-/brlcad/trunk/src/libbu:72518-74373,74376-75207,75729,76645-76726
\ No newline at end of property
+/brlcad/trunk/src/libbu:72518-74373,74376-75207,75729,76645-76726,76771-76788
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/libbu/units.c
===================================================================
--- brlcad/branches/RELEASE/src/libbu/units.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libbu/units.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -43,15 +43,21 @@
#include "bu/units.h"
#include "bu/vls.h"
+
struct cvt_tab {
double val;
char name[32];
};
+
struct conv_table {
struct cvt_tab *cvttab;
};
+
+/* Keep table sorted sorted small-to-large. Algorithms below may rely
+ * on the ordering.
+ */
static struct cvt_tab bu_units_length_tab[] = {
{0.0, "none"},
{1.0e-21, "ym"},
@@ -134,6 +140,9 @@
};
#define BU_UNITS_TABLE_SIZE (sizeof(bu_units_length_tab) / sizeof(struct
cvt_tab) - 1)
+/* Keep table sorted sorted small-to-large. Algorithms below may rely
+ * on the ordering.
+ */
static struct cvt_tab bu_units_volume_tab[] = {
{0.0, "none"},
{1.0, "mm^3"}, /* default */
@@ -156,6 +165,10 @@
{0.0, ""} /* LAST ENTRY */
};
+
+/* Keep table sorted sorted small-to-large. Algorithms below may rely
+ * on the ordering.
+ */
static struct cvt_tab bu_units_mass_tab[] = {
{0.0, "none"},
{1.0, "grams"}, /* default */
@@ -170,6 +183,7 @@
{0.0, ""} /* LAST ENTRY */
};
+
static const struct conv_table unit_lists[4] = {
{bu_units_length_tab}, {bu_units_volume_tab}, {bu_units_mass_tab}, {NULL}
};
@@ -241,21 +255,29 @@
double
bu_units_conversion(const char *str)
{
- register const struct cvt_tab *tp;
- register const struct conv_table *cvtab;
- char ubuf[256];
+ const struct cvt_tab *tp;
+ const struct conv_table *cvtab;
+ double factor = 1.0;
- /* Copy the given string */
- bu_strlcpy(ubuf, str, sizeof(ubuf));
-
- /* Search for this string in the table */
+ /* Search for the units string in the table matching by name. */
for (cvtab=unit_lists; cvtab->cvttab; cvtab++) {
for (tp=cvtab->cvttab; tp->name[0]; tp++) {
- if (!units_name_matches(ubuf, tp->name))
- continue;
- return tp->val;
+ if (units_name_matches(str, tp->name)) {
+ return tp->val;
+ }
}
}
+ /* couldn't find it by name, check by value */
+ factor = bu_mm_value(str);
+ if (!EQUAL(factor, 1.0)) {
+ for (cvtab=unit_lists; cvtab->cvttab; cvtab++) {
+ for (tp=cvtab->cvttab; tp->name[0]; tp++) {
+ if (EQUAL(factor, tp->val)) {
+ return tp->val;
+ }
+ }
+ }
+ }
return 0.0; /* Unable to find it */
}
@@ -295,6 +317,7 @@
return (const char *)NULL;
}
+
struct bu_vls *
bu_units_strings_vls()
{
@@ -361,6 +384,8 @@
double
bu_mm_value(const char *s)
+
+
{
double v;
char *ptr;
@@ -411,6 +436,7 @@
*p = bu_mm_value(value);
}
+
/*
* Local Variables:
* mode: C
Modified: brlcad/branches/RELEASE/src/libdm/X/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/X/CMakeLists.txt 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/X/CMakeLists.txt 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -36,6 +36,7 @@
CMakeLists.txt
${X_SRCS}
dm-X.h
+ fb_X.h
)
# Local Variables:
Modified: brlcad/branches/RELEASE/src/libdm/dm_init.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libdm/dm_init.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/dm_init.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -104,7 +104,7 @@
continue;
}
- if (((uintptr_t)(plugin) & (sizeof((uintptr_t)(plugin))-1)) ||
*((const uint32_t *)(plugin)) != (uint32_t)(DM_API)) {
+ if (*((const uint32_t *)(plugin)) != (uint32_t)(DM_API)) {
bu_vls_printf(dm_init_msg_str, "Plugin version %d of '%s'
differs from %d (skipping)\n", *((const uint32_t *)(plugin)), pfile, DM_API);
bu_dlclose(dl_handle);
continue;
Modified: brlcad/branches/RELEASE/src/libdm/glx/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/glx/CMakeLists.txt 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/glx/CMakeLists.txt 2020-08-15
14:31:44 UTC (rev 76789)
@@ -39,7 +39,9 @@
CMAKEFILES(
CMakeLists.txt
${OGL_SRCS}
+ dm-glx.h
dm-ogl.h
+ fb_ogl.h
)
# Local Variables:
Modified: brlcad/branches/RELEASE/src/libdm/osgl/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/osgl/CMakeLists.txt 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/osgl/CMakeLists.txt 2020-08-15
14:31:44 UTC (rev 76789)
@@ -67,6 +67,7 @@
CMAKEFILES(
${OSGL_SRCS}
+ CMakeLists.txt
dm-osgl.h
fb_osgl.h
osg-test.cpp
Modified: brlcad/branches/RELEASE/src/libdm/plot/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/plot/CMakeLists.txt 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/plot/CMakeLists.txt 2020-08-15
14:31:44 UTC (rev 76789)
@@ -26,6 +26,7 @@
CMAKEFILES(
${PLOT_SRCS}
+ CMakeLists.txt
dm-plot.h
)
Modified: brlcad/branches/RELEASE/src/libdm/postscript/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/postscript/CMakeLists.txt 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/postscript/CMakeLists.txt 2020-08-15
14:31:44 UTC (rev 76789)
@@ -17,7 +17,7 @@
add_definitions(-DDM_PLUGIN)
add_library(dm-ps SHARED ${PS_SRCS})
- target_link_libraries(dm-ps libdm libbu)
+ target_link_libraries(dm-ps libdm libbu ${TCL_LIBRARY})
set_property(TARGET dm-ps APPEND PROPERTY COMPILE_DEFINITIONS BRLCADBUILD
HAVE_CONFIG_H)
VALIDATE_STYLE(dm-ps "${PS_SRCS}")
Modified: brlcad/branches/RELEASE/src/libdm/qt/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/qt/CMakeLists.txt 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/qt/CMakeLists.txt 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -46,6 +46,7 @@
CMAKEFILES(
CMakeLists.txt
${QT_SRCS}
+ dm-qt.h
fb_qt.h
)
Modified: brlcad/branches/RELEASE/src/libdm/wgl/CMakeLists.txt
===================================================================
--- brlcad/branches/RELEASE/src/libdm/wgl/CMakeLists.txt 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libdm/wgl/CMakeLists.txt 2020-08-15
14:31:44 UTC (rev 76789)
@@ -35,6 +35,7 @@
CMakeLists.txt
${WGL_SRCS}
dm-wgl.h
+ fb_wgl.h
)
# Local Variables:
Modified: brlcad/branches/RELEASE/src/libged/3ptarb/3ptarb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/3ptarb/3ptarb.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/3ptarb/3ptarb.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -266,7 +266,7 @@
const struct ged_cmd threeptarb_cmd = { &threeptarb_cmd_impl };
const struct ged_cmd *threeptarb_cmds[] = { &threeptarb_cmd, NULL };
-static const struct ged_plugin pinfo = { threeptarb_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, threeptarb_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/adc/adc.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/adc/adc.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/adc/adc.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -709,7 +709,7 @@
const struct ged_cmd adc_cmd = { &adc_cmd_impl };
const struct ged_cmd *adc_cmds[] = { &adc_cmd, NULL };
-static const struct ged_plugin pinfo = { adc_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, adc_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/adjust/adjust.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/adjust/adjust.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/adjust/adjust.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -96,7 +96,7 @@
const struct ged_cmd adjust_cmd = { &adjust_cmd_impl };
const struct ged_cmd *adjust_cmds[] = { &adjust_cmd, NULL };
-static const struct ged_plugin pinfo = { adjust_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, adjust_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/ae2dir/ae2dir.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/ae2dir/ae2dir.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/ae2dir/ae2dir.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -94,7 +94,7 @@
const struct ged_cmd ae2dir_cmd = { &ae2dir_cmd_impl };
const struct ged_cmd *ae2dir_cmds[] = { &ae2dir_cmd, NULL };
-static const struct ged_plugin pinfo = { ae2dir_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, ae2dir_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/analyze/analyze.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/analyze/analyze.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/analyze/analyze.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -1322,7 +1322,7 @@
const struct ged_cmd analyze_cmd = { &analyze_cmd_impl };
const struct ged_cmd *analyze_cmds[] = { &analyze_cmd, NULL };
-static const struct ged_plugin pinfo = { analyze_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, analyze_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/annotate/annotate.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/annotate/annotate.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/annotate/annotate.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -180,7 +180,7 @@
const struct ged_cmd annotate_cmd = { &annotate_cmd_impl };
const struct ged_cmd *annotate_cmds[] = { &annotate_cmd, NULL };
-static const struct ged_plugin pinfo = { annotate_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, annotate_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/arb/arb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/arb/arb.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/arb/arb.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -140,7 +140,7 @@
const struct ged_cmd *arb_cmds[] = { &arb_cmd, &rotate_arb_face_cmd, NULL };
-static const struct ged_plugin pinfo = { arb_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, arb_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/arced/arced.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/arced/arced.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/arced/arced.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -144,7 +144,7 @@
const struct ged_cmd arced_cmd = { &arced_cmd_impl };
const struct ged_cmd *arced_cmds[] = { &arced_cmd, NULL };
-static const struct ged_plugin pinfo = { arced_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, arced_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/arot/arot.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/arot/arot.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/arot/arot.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -56,7 +56,7 @@
const struct ged_cmd arot_cmd = { &arot_cmd_impl };
const struct ged_cmd *arot_cmds[] = { &arot_cmd, NULL };
-static const struct ged_plugin pinfo = { arot_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, arot_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/attr/attr.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/attr/attr.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/attr/attr.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -753,7 +753,7 @@
const struct ged_cmd attr_pcmd = { &attr_cmd_impl };
const struct ged_cmd *attr_cmds[] = { &attr_pcmd, NULL };
- static const struct ged_plugin pinfo = { attr_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, attr_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/autoview/autoview.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/autoview/autoview.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/autoview/autoview.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -121,7 +121,7 @@
const struct ged_cmd autoview_cmd = { &autoview_cmd_impl };
const struct ged_cmd *autoview_cmds[] = { &autoview_cmd, NULL };
-static const struct ged_plugin pinfo = { autoview_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, autoview_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/bb/bb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/bb/bb.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/bb/bb.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -323,7 +323,7 @@
const struct ged_cmd bb_cmd = { &bb_cmd_impl };
const struct ged_cmd *bb_cmds[] = { &bb_cmd, NULL };
-static const struct ged_plugin pinfo = { bb_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, bb_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/bev/bev.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/bev/bev.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/bev/bev.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -319,7 +319,7 @@
const struct ged_cmd bev_cmd = { &bev_cmd_impl };
const struct ged_cmd *bev_cmds[] = { &bev_cmd, NULL };
-static const struct ged_plugin pinfo = { bev_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, bev_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/bigE/bigE.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/bigE/bigE.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/bigE/bigE.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -2140,7 +2140,7 @@
const struct ged_cmd bigE_cmd = { &bigE_cmd_impl };
const struct ged_cmd *bigE_cmds[] = { &bigE_cmd, NULL };
-static const struct ged_plugin pinfo = { bigE_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, bigE_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/blast/blast.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/blast/blast.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/blast/blast.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -76,7 +76,7 @@
const struct ged_cmd *blast_cmds[] = { &blast_cmd, &B_cmd, NULL };
-static const struct ged_plugin pinfo = { blast_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, blast_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/bo/bo.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/bo/bo.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/bo/bo.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -250,7 +250,7 @@
const struct ged_cmd bo_cmd = { &bo_cmd_impl };
const struct ged_cmd *bo_cmds[] = { &bo_cmd, NULL };
-static const struct ged_plugin pinfo = { bo_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, bo_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/bot/bot.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/bot/bot.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/bot/bot.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -516,7 +516,7 @@
NULL
};
- static const struct ged_plugin pinfo = { bot_cmds, 17 };
+ static const struct ged_plugin pinfo = { GED_API, bot_cmds, 17 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/brep/brep.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/brep/brep.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/brep/brep.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -1482,7 +1482,7 @@
const struct ged_cmd brep_cmd = { &brep_cmd_impl };
const struct ged_cmd *brep_cmds[] = { &brep_cmd, NULL };
- static const struct ged_plugin pinfo = { brep_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, brep_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/cat/cat.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/cat/cat.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/cat/cat.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -73,7 +73,7 @@
const struct ged_cmd cat_cmd = { &cat_cmd_impl };
const struct ged_cmd *cat_cmds[] = { &cat_cmd, NULL };
-static const struct ged_plugin pinfo = { cat_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, cat_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/cc/cc.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/cc/cc.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/cc/cc.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -91,7 +91,7 @@
const struct ged_cmd cc_cmd = { &cc_cmd_impl };
const struct ged_cmd *cc_cmds[] = { &cc_cmd, NULL };
-static const struct ged_plugin pinfo = { cc_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, cc_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/check/check.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/check/check.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/check/check.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -693,7 +693,7 @@
const struct ged_cmd check_cmd = { &check_cmd_impl };
const struct ged_cmd *check_cmds[] = { &check_cmd, NULL };
-static const struct ged_plugin pinfo = { check_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, check_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/clone/clone.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/clone/clone.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/clone/clone.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -1032,7 +1032,7 @@
const struct ged_cmd clone_cmd = { &clone_cmd_impl };
const struct ged_cmd *clone_cmds[] = { &clone_cmd, NULL };
-static const struct ged_plugin pinfo = { clone_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, clone_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/coil/coil.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/coil/coil.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/coil/coil.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -568,7 +568,7 @@
const struct ged_cmd coil_cmd = { &coil_cmd_impl };
const struct ged_cmd *coil_cmds[] = { &coil_cmd, NULL };
-static const struct ged_plugin pinfo = { coil_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, coil_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/color/color.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/color/color.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/color/color.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -369,7 +369,7 @@
const struct ged_cmd *color_cmds[] = { &color_cmd, &edcolor_cmd, NULL };
-static const struct ged_plugin pinfo = { color_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, color_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/comb/comb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/comb/comb.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/comb/comb.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -789,7 +789,7 @@
const struct ged_cmd comb_cmd = { &comb_cmd_impl };
const struct ged_cmd *comb_cmds[] = { &comb_cmd, NULL };
-static const struct ged_plugin pinfo = { comb_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, comb_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/comb_color/comb_color.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/comb_color/comb_color.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/comb_color/comb_color.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -88,7 +88,7 @@
const struct ged_cmd comb_color_cmd = { &comb_color_cmd_impl };
const struct ged_cmd *comb_color_cmds[] = { &comb_color_cmd, NULL };
-static const struct ged_plugin pinfo = { comb_color_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, comb_color_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/comb_std/comb_std.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/comb_std/comb_std.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/comb_std/comb_std.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -664,7 +664,7 @@
const struct ged_cmd *comb_std_cmds[] = { &comb_std_cmd, &c_std_cmd, NULL };
-static const struct ged_plugin pinfo = { comb_std_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, comb_std_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/combmem/combmem.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/combmem/combmem.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/combmem/combmem.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -1090,7 +1090,7 @@
const struct ged_cmd combmem_cmd = { &combmem_cmd_impl };
const struct ged_cmd *combmem_cmds[] = { &combmem_cmd, NULL };
-static const struct ged_plugin pinfo = { combmem_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, combmem_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/concat/concat.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/concat/concat.cpp 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/concat/concat.cpp 2020-08-15
14:31:44 UTC (rev 76789)
@@ -537,7 +537,7 @@
const struct ged_cmd *concat_cmds[] = { &concat_cmd, &dbconcat_cmd, NULL
};
- static const struct ged_plugin pinfo = { concat_cmds, 2 };
+ static const struct ged_plugin pinfo = { GED_API, concat_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/constraint/constraint.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/constraint/constraint.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/constraint/constraint.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -367,7 +367,7 @@
const struct ged_cmd constraint_cmd = { &constraint_cmd_impl };
const struct ged_cmd *constraint_cmds[] = { &constraint_cmd, NULL };
-static const struct ged_plugin pinfo = { constraint_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, constraint_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/copy/copy.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/copy/copy.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/copy/copy.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -91,7 +91,7 @@
const struct ged_cmd *copy_cmds[] = { ©_cmd, &cp_cmd, NULL };
-static const struct ged_plugin pinfo = { copy_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, copy_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/copyeval/copyeval.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/copyeval/copyeval.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/copyeval/copyeval.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -181,7 +181,7 @@
const struct ged_cmd copyeval_cmd = { ©eval_cmd_impl };
const struct ged_cmd *copyeval_cmds[] = { ©eval_cmd, NULL };
-static const struct ged_plugin pinfo = { copyeval_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, copyeval_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/copymat/copymat.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/copymat/copymat.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/copymat/copymat.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -167,7 +167,7 @@
const struct ged_cmd copymat_cmd = { ©mat_cmd_impl };
const struct ged_cmd *copymat_cmds[] = { ©mat_cmd, NULL };
-static const struct ged_plugin pinfo = { copymat_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, copymat_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/cpi/cpi.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/cpi/cpi.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/cpi/cpi.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -113,7 +113,7 @@
const struct ged_cmd cpi_cmd = { &cpi_cmd_impl };
const struct ged_cmd *cpi_cmds[] = { &cpi_cmd, NULL };
-static const struct ged_plugin pinfo = { cpi_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, cpi_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/dag/dag.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/dag/dag.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/dag/dag.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -831,7 +831,7 @@
const struct ged_cmd dag_cmd = { &dag_cmd_impl };
const struct ged_cmd *dag_cmds[] = { &dag_cmd, NULL };
- static const struct ged_plugin pinfo = { dag_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, dag_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/dbip/dbip.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/dbip/dbip.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/dbip/dbip.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -67,7 +67,7 @@
const struct ged_cmd *dbip_cmds[] = { &get_dbip_cmd, &dbip_cmd, NULL };
-static const struct ged_plugin pinfo = { dbip_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, dbip_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/debug/debug.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/debug/debug.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/debug/debug.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -58,7 +58,7 @@
const struct ged_cmd debug_pcmd = { &debug_cmd_impl };
const struct ged_cmd *debug_cmds[] = { &debug_pcmd, NULL };
- static const struct ged_plugin pinfo = { debug_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, debug_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/debugbu/debugbu.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/debugbu/debugbu.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/debugbu/debugbu.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -79,7 +79,7 @@
const struct ged_cmd debugbu_cmd = { &debugbu_cmd_impl };
const struct ged_cmd *debugbu_cmds[] = { &debugbu_cmd, NULL };
-static const struct ged_plugin pinfo = { debugbu_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, debugbu_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/debugdir/debugdir.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/debugdir/debugdir.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/debugdir/debugdir.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -63,7 +63,7 @@
const struct ged_cmd debugdir_cmd = { &debugdir_cmd_impl };
const struct ged_cmd *debugdir_cmds[] = { &debugdir_cmd, NULL };
-static const struct ged_plugin pinfo = { debugdir_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, debugdir_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/debuglib/debuglib.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/debuglib/debuglib.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/debuglib/debuglib.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -79,7 +79,7 @@
const struct ged_cmd debuglib_cmd = { &debuglib_cmd_impl };
const struct ged_cmd *debuglib_cmds[] = { &debuglib_cmd, NULL };
-static const struct ged_plugin pinfo = { debuglib_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, debuglib_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/debugnmg/debugnmg.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/debugnmg/debugnmg.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/debugnmg/debugnmg.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -78,7 +78,7 @@
const struct ged_cmd debugnmg_cmd = { &debugnmg_cmd_impl };
const struct ged_cmd *debugnmg_cmds[] = { &debugnmg_cmd, NULL };
-static const struct ged_plugin pinfo = { debugnmg_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, debugnmg_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/decompose/decompose.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/decompose/decompose.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/decompose/decompose.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -212,7 +212,7 @@
const struct ged_cmd decompose_cmd = { &decompose_cmd_impl };
const struct ged_cmd *decompose_cmds[] = { &decompose_cmd, NULL };
-static const struct ged_plugin pinfo = { decompose_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, decompose_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/delay/delay.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/delay/delay.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/delay/delay.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -76,7 +76,7 @@
const struct ged_cmd delay_cmd = { &delay_cmd_impl };
const struct ged_cmd *delay_cmds[] = { &delay_cmd, NULL };
-static const struct ged_plugin pinfo = { delay_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, delay_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/dir2ae/dir2ae.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/dir2ae/dir2ae.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/dir2ae/dir2ae.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -95,7 +95,7 @@
const struct ged_cmd dir2ae_cmd = { &dir2ae_cmd_impl };
const struct ged_cmd *dir2ae_cmds[] = { &dir2ae_cmd, NULL };
-static const struct ged_plugin pinfo = { dir2ae_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, dir2ae_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/draw/draw.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/draw/draw.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/draw/draw.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -1328,7 +1328,7 @@
const struct ged_cmd *draw_cmds[] = { &draw_cmd, &e_cmd, &ev_cmd,
&loadview_cmd, &preview_cmd, NULL };
-static const struct ged_plugin pinfo = { draw_cmds, 5 };
+static const struct ged_plugin pinfo = { GED_API, draw_cmds, 5 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/dsp/dsp.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/dsp/dsp.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/dsp/dsp.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -160,7 +160,7 @@
const struct ged_cmd dsp_cmd = { &dsp_cmd_impl };
const struct ged_cmd *dsp_cmds[] = { &dsp_cmd, NULL };
-static const struct ged_plugin pinfo = { dsp_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, dsp_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/dump/dump.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/dump/dump.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/dump/dump.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -85,7 +85,7 @@
const struct ged_cmd dump_cmd = { &dump_cmd_impl };
const struct ged_cmd *dump_cmds[] = { &dump_cmd, NULL };
-static const struct ged_plugin pinfo = { dump_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, dump_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/dup/dup.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/dup/dup.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/dup/dup.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -248,7 +248,7 @@
const struct ged_cmd dup_cmd = { &dup_cmd_impl };
const struct ged_cmd *dup_cmds[] = { &dup_cmd, NULL };
-static const struct ged_plugin pinfo = { dup_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, dup_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/eac/eac.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/eac/eac.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/eac/eac.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -120,7 +120,7 @@
const struct ged_cmd eac_cmd = { &eac_cmd_impl };
const struct ged_cmd *eac_cmds[] = { &eac_cmd, NULL };
-static const struct ged_plugin pinfo = { eac_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, eac_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/echo/echo.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/echo/echo.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/echo/echo.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -64,7 +64,7 @@
const struct ged_cmd echo_cmd = { &echo_cmd_impl };
const struct ged_cmd *echo_cmds[] = { &echo_cmd, NULL };
-static const struct ged_plugin pinfo = { echo_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, echo_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/edarb/edarb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/edarb/edarb.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/edarb/edarb.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -372,7 +372,7 @@
const struct ged_cmd edarb_cmd = { &edarb_cmd_impl };
const struct ged_cmd *edarb_cmds[] = { &edarb_cmd, NULL };
-static const struct ged_plugin pinfo = { edarb_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, edarb_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/edcodes/edcodes.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/edcodes/edcodes.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/edcodes/edcodes.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -304,7 +304,7 @@
const struct ged_cmd edcodes_cmd = { &edcodes_cmd_impl };
const struct ged_cmd *edcodes_cmds[] = { &edcodes_cmd, NULL };
-static const struct ged_plugin pinfo = { edcodes_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, edcodes_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/edcomb/edcomb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/edcomb/edcomb.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/edcomb/edcomb.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -103,7 +103,7 @@
const struct ged_cmd edcomb_cmd = { &edcomb_cmd_impl };
const struct ged_cmd *edcomb_cmds[] = { &edcomb_cmd, NULL };
-static const struct ged_plugin pinfo = { edcomb_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, edcomb_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/edit/edit.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/edit/edit.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/edit/edit.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -2431,7 +2431,7 @@
const struct ged_cmd edit_cmd = { &edit_cmd_impl };
const struct ged_cmd *edit_pcmds[] = { &edit_cmd, NULL };
-static const struct ged_plugin pinfo = { edit_pcmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, edit_pcmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/editit/editit.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/editit/editit.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/editit/editit.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -75,7 +75,7 @@
const struct ged_cmd editit_cmd = { &editit_cmd_impl };
const struct ged_cmd *editit_cmds[] = { &editit_cmd, NULL };
-static const struct ged_plugin pinfo = { editit_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, editit_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/edmater/edmater.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/edmater/edmater.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/edmater/edmater.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -123,7 +123,7 @@
const struct ged_cmd edmater_cmd = { &edmater_cmd_impl };
const struct ged_cmd *edmater_cmds[] = { &edmater_cmd, NULL };
-static const struct ged_plugin pinfo = { edmater_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, edmater_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/env/env.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/env/env.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/env/env.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -72,7 +72,7 @@
const struct ged_cmd env_pcmd = { &env_cmd_impl };
const struct ged_cmd *env_cmds[] = { &env_pcmd, NULL };
-static const struct ged_plugin pinfo = { env_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, env_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/erase/erase.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/erase/erase.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/erase/erase.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -187,7 +187,7 @@
const struct ged_cmd *erase_cmds[] = { &erase_cmd, &d_cmd, NULL };
-static const struct ged_plugin pinfo = { erase_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, erase_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/exists/exists.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/exists/exists.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/exists/exists.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -499,7 +499,7 @@
const struct ged_cmd exists_cmd = { &exists_cmd_impl };
const struct ged_cmd *exists_cmds[] = { &exists_cmd, NULL };
-static const struct ged_plugin pinfo = { exists_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, exists_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/expand/expand.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/expand/expand.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/expand/expand.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -143,7 +143,7 @@
const struct ged_cmd expand_cmd = { &expand_cmd_impl };
const struct ged_cmd *expand_cmds[] = { &expand_cmd, NULL };
-static const struct ged_plugin pinfo = { expand_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, expand_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/eye_pos/eye_pos.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/eye_pos/eye_pos.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/eye_pos/eye_pos.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -105,7 +105,7 @@
const struct ged_cmd eye_pos_cmd = { &eye_pos_cmd_impl };
const struct ged_cmd *eye_pos_cmds[] = { &eye_pos_cmd, NULL };
-static const struct ged_plugin pinfo = { eye_pos_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, eye_pos_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/facetize/facetize.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/facetize/facetize.cpp 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/facetize/facetize.cpp 2020-08-15
14:31:44 UTC (rev 76789)
@@ -2982,7 +2982,7 @@
const struct ged_cmd facetize_cmd = { &facetize_cmd_impl };
const struct ged_cmd *facetize_cmds[] = { &facetize_cmd, NULL };
- static const struct ged_plugin pinfo = { facetize_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, facetize_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/fb2pix/fb2pix.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/fb2pix/fb2pix.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/fb2pix/fb2pix.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -172,7 +172,7 @@
const struct ged_cmd fb2pix_cmd = { &fb2pix_cmd_impl };
const struct ged_cmd *fb2pix_cmds[] = { &fb2pix_cmd, NULL };
-static const struct ged_plugin pinfo = { fb2pix_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, fb2pix_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/fbclear/fbclear.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/fbclear/fbclear.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/fbclear/fbclear.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -112,7 +112,7 @@
const struct ged_cmd fbclear_cmd = { &fbclear_cmd_impl };
const struct ged_cmd *fbclear_cmds[] = { &fbclear_cmd, NULL };
-static const struct ged_plugin pinfo = { fbclear_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, fbclear_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/find/find.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/find/find.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/find/find.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -150,7 +150,7 @@
const struct ged_cmd *find_cmds[] = { &find_cmd, &dbfind_cmd, NULL };
-static const struct ged_plugin pinfo = { find_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, find_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/form/form.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/form/form.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/form/form.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -79,7 +79,7 @@
const struct ged_cmd form_cmd = { &form_cmd_impl };
const struct ged_cmd *form_cmds[] = { &form_cmd, NULL };
-static const struct ged_plugin pinfo = { form_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, form_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/fracture/fracture.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/fracture/fracture.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/fracture/fracture.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -219,7 +219,7 @@
const struct ged_cmd fracture_cmd = { &fracture_cmd_impl };
const struct ged_cmd *fracture_cmds[] = { &fracture_cmd, NULL };
-static const struct ged_plugin pinfo = { fracture_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, fracture_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/gdiff/gdiff.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/gdiff/gdiff.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/gdiff/gdiff.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -241,7 +241,7 @@
const struct ged_cmd gdiff_cmd = { &gdiff_cmd_impl };
const struct ged_cmd *gdiff_cmds[] = { &gdiff_cmd, NULL };
-static const struct ged_plugin pinfo = { gdiff_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, gdiff_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/ged.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/ged.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/ged.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -294,7 +294,7 @@
gedp->ged_io_data = NULL;
/* Out of the gate we don't have display managers or views */
- gedp->ged_gvp = NULL;
+ gedp->ged_gvp = GED_VIEW_NULL;
gedp->ged_dmp = NULL;
/* ? */
Modified: brlcad/branches/RELEASE/src/libged/ged_init.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/ged_init.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/ged_init.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -163,12 +163,24 @@
const struct ged_plugin *plugin = plugin_info();
- if (!plugin || !plugin->cmds) {
- bu_vls_printf(ged_init_msg_str, "Invalid plugin encountered
from '%s' (skipping)\n", pfile);
+ if (!plugin) {
+ bu_vls_printf(ged_init_msg_str, "Invalid plugin file '%s'
encountered (skipping)\n", pfile);
bu_dlclose(dl_handle);
continue;
}
+ if (((uintptr_t)(plugin) & (sizeof((uintptr_t)(plugin))-1)) ||
*((const uint32_t *)(plugin)) != (uint32_t) (GED_API)) {
+ bu_vls_printf(ged_init_msg_str, "Plugin version %d of '%s'
differs from %d (skipping)\n", *((const uint32_t *)(plugin)), pfile, GED_API);
+ bu_dlclose(dl_handle);
+ continue;
+ }
+
+ if (!plugin->cmds) {
+ bu_vls_printf(ged_init_msg_str, "Invalid plugin file '%s'
encountered (skipping)\n", pfile);
+ bu_dlclose(dl_handle);
+ continue;
+ }
+
if (!plugin->cmd_cnt) {
bu_vls_printf(ged_init_msg_str, "Plugin '%s' contains no
commands, (skipping)\n", pfile);
bu_dlclose(dl_handle);
Modified: brlcad/branches/RELEASE/src/libged/get/get.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/get/get.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/get/get.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -88,7 +88,7 @@
const struct ged_cmd get_cmd = { &get_cmd_impl };
const struct ged_cmd *get_cmds[] = { &get_cmd, NULL };
-static const struct ged_plugin pinfo = { get_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, get_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/get_autoview/get_autoview.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/get_autoview/get_autoview.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/get_autoview/get_autoview.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -112,7 +112,7 @@
const struct ged_cmd get_autoview_cmd = { &get_autoview_cmd_impl };
const struct ged_cmd *get_autoview_cmds[] = { &get_autoview_cmd, NULL };
-static const struct ged_plugin pinfo = { get_autoview_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, get_autoview_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/get_comb/get_comb.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/get_comb/get_comb.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/get_comb/get_comb.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -200,7 +200,7 @@
const struct ged_cmd get_comb_cmd = { &get_comb_cmd_impl };
const struct ged_cmd *get_comb_cmds[] = { &get_comb_cmd, NULL };
-static const struct ged_plugin pinfo = { get_comb_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, get_comb_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/get_eyemodel/get_eyemodel.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/get_eyemodel/get_eyemodel.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/get_eyemodel/get_eyemodel.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -79,7 +79,7 @@
const struct ged_cmd get_eyemodel_cmd = { &get_eyemodel_cmd_impl };
const struct ged_cmd *get_eyemodel_cmds[] = { &get_eyemodel_cmd, NULL };
-static const struct ged_plugin pinfo = { get_eyemodel_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, get_eyemodel_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/get_type/get_type.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/get_type/get_type.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/get_type/get_type.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -221,7 +221,7 @@
const struct ged_cmd get_type_cmd = { &get_type_cmd_impl };
const struct ged_cmd *get_type_cmds[] = { &get_type_cmd, NULL };
-static const struct ged_plugin pinfo = { get_type_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, get_type_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/glob/glob.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/glob/glob.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/glob/glob.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -249,7 +249,7 @@
const struct ged_cmd *glob_cmds[] = { &glob_cmd, &db_glob_cmd, NULL };
-static const struct ged_plugin pinfo = { glob_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, glob_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/gqa/gqa.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/gqa/gqa.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/gqa/gqa.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -2563,7 +2563,7 @@
const struct ged_cmd gqa_cmd = { &gqa_cmd_impl };
const struct ged_cmd *gqa_cmds[] = { &gqa_cmd, NULL };
-static const struct ged_plugin pinfo = { gqa_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, gqa_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/grid/grid.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/grid/grid.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/grid/grid.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -307,7 +307,7 @@
const struct ged_cmd grid_cmd = { &grid_cmd_impl };
const struct ged_cmd *grid_cmds[] = { &grid_cmd, NULL };
-static const struct ged_plugin pinfo = { grid_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, grid_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/grid2model_lu/grid2model_lu.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/grid2model_lu/grid2model_lu.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/grid2model_lu/grid2model_lu.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -85,7 +85,7 @@
const struct ged_cmd grid2model_lu_cmd = { &grid2model_lu_cmd_impl };
const struct ged_cmd *grid2model_lu_cmds[] = { &grid2model_lu_cmd, NULL };
-static const struct ged_plugin pinfo = { grid2model_lu_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, grid2model_lu_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/grid2view_lu/grid2view_lu.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/grid2view_lu/grid2view_lu.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/grid2view_lu/grid2view_lu.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -82,7 +82,7 @@
const struct ged_cmd grid2view_lu_cmd = { &grid2view_lu_cmd_impl };
const struct ged_cmd *grid2view_lu_cmds[] = { &grid2view_lu_cmd, NULL };
-static const struct ged_plugin pinfo = { grid2view_lu_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, grid2view_lu_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/group/group.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/group/group.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/group/group.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -70,7 +70,7 @@
const struct ged_cmd *group_cmds[] = { &group_cmd, &g_cmd, NULL };
-static const struct ged_plugin pinfo = { group_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, group_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/heal/heal.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/heal/heal.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/heal/heal.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -96,7 +96,7 @@
const struct ged_cmd heal_cmd = { &heal_cmd_impl };
const struct ged_cmd *heal_cmds[] = { &heal_cmd, NULL };
-static const struct ged_plugin pinfo = { heal_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, heal_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/help/help.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/help/help.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/help/help.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -288,7 +288,7 @@
const struct ged_cmd *help_cmds[] = { &help_cmd, &apropos_cmd,
&info_cmd, &man_cmd, &question_cmd, NULL };
- static const struct ged_plugin pinfo = { help_cmds, 5 };
+ static const struct ged_plugin pinfo = { GED_API, help_cmds, 5 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/hide/hide.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/hide/hide.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/hide/hide.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -119,7 +119,7 @@
const struct ged_cmd hide_cmd = { &hide_cmd_impl };
const struct ged_cmd *hide_cmds[] = { &hide_cmd, NULL };
-static const struct ged_plugin pinfo = { hide_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, hide_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/how/how.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/how/how.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/how/how.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -103,7 +103,7 @@
const struct ged_cmd how_cmd = { &how_cmd_impl };
const struct ged_cmd *how_cmds[] = { &how_cmd, NULL };
-static const struct ged_plugin pinfo = { how_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, how_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/human/human.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/human/human.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/human/human.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -2501,7 +2501,7 @@
const struct ged_cmd human_cmd = { &human_cmd_impl };
const struct ged_cmd *human_cmds[] = { &human_cmd, NULL };
-static const struct ged_plugin pinfo = { human_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, human_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/illum/illum.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/illum/illum.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/illum/illum.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -106,7 +106,7 @@
const struct ged_cmd illum_cmd = { &illum_cmd_impl };
const struct ged_cmd *illum_cmds[] = { &illum_cmd, NULL };
-static const struct ged_plugin pinfo = { illum_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, illum_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/importFg4Section/importFg4Section.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/importFg4Section/importFg4Section.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/importFg4Section/importFg4Section.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -72,7 +72,7 @@
const struct ged_cmd importFg4Section_cmd = { &importFg4Section_cmd_impl };
const struct ged_cmd *importFg4Section_cmds[] = { &importFg4Section_cmd, NULL
};
-static const struct ged_plugin pinfo = { importFg4Section_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, importFg4Section_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/include/plugin.h
===================================================================
--- brlcad/branches/RELEASE/src/libged/include/plugin.h 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/include/plugin.h 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -24,7 +24,10 @@
*/
#include "../ged_private.h"
+#include "brlcad_version.h"
+#define GED_API ((BRLCAD_VERSION_MAJOR*10000) + (BRLCAD_VERSION_MINOR*100) +
BRLCAD_VERSION_PATCH)
+
extern void *ged_cmds;
/* Default command behaviors when it comes to impacts on calling applications.
Modified: brlcad/branches/RELEASE/src/libged/inside/inside.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/inside/inside.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/inside/inside.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -86,7 +86,7 @@
const struct ged_cmd inside_cmd = { &inside_cmd_impl };
const struct ged_cmd *inside_cmds[] = { &inside_cmd, NULL };
-static const struct ged_plugin pinfo = { inside_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, inside_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/instance/instance.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/instance/instance.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/instance/instance.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -88,7 +88,7 @@
const struct ged_cmd *instance_cmds[] = { &instance_cmd, &i_cmd, NULL };
-static const struct ged_plugin pinfo = { instance_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, instance_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/isize/isize.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/isize/isize.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/isize/isize.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -65,7 +65,7 @@
const struct ged_cmd isize_cmd = { &isize_cmd_impl };
const struct ged_cmd *isize_cmds[] = { &isize_cmd, NULL };
-static const struct ged_plugin pinfo = { isize_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, isize_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/item/item.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/item/item.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/item/item.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -115,7 +115,7 @@
const struct ged_cmd item_cmd = { &item_cmd_impl };
const struct ged_cmd *item_cmds[] = { &item_cmd, NULL };
-static const struct ged_plugin pinfo = { item_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, item_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/joint/joint.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/joint/joint.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/joint/joint.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -3582,7 +3582,7 @@
const struct ged_cmd joint_pcmd = { &joint_cmd_impl };
const struct ged_cmd *joint_cmds[] = { &joint_pcmd, NULL };
-static const struct ged_plugin pinfo = { joint_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, joint_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/joint2/joint2.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/joint2/joint2.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/joint2/joint2.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -241,7 +241,7 @@
const struct ged_cmd joint2_cmd = { &joint2_cmd_impl };
const struct ged_cmd *joint2_cmds[] = { &joint2_cmd, NULL };
-static const struct ged_plugin pinfo = { joint2_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, joint2_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/keep/keep.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/keep/keep.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/keep/keep.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -239,7 +239,7 @@
const struct ged_cmd keep_cmd = { &keep_cmd_impl };
const struct ged_cmd *keep_cmds[] = { &keep_cmd, NULL };
-static const struct ged_plugin pinfo = { keep_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, keep_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/keypoint/keypoint.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/keypoint/keypoint.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/keypoint/keypoint.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -102,7 +102,7 @@
const struct ged_cmd keypoint_cmd = { &keypoint_cmd_impl };
const struct ged_cmd *keypoint_cmds[] = { &keypoint_cmd, NULL };
-static const struct ged_plugin pinfo = { keypoint_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, keypoint_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/kill/kill.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/kill/kill.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/kill/kill.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -135,7 +135,7 @@
const struct ged_cmd kill_cmd = { &kill_cmd_impl };
const struct ged_cmd *kill_cmds[] = { &kill_cmd, NULL };
-static const struct ged_plugin pinfo = { kill_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, kill_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/killall/killall.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/killall/killall.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/killall/killall.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -99,7 +99,7 @@
const struct ged_cmd killall_cmd = { &killall_cmd_impl };
const struct ged_cmd *killall_cmds[] = { &killall_cmd, NULL };
-static const struct ged_plugin pinfo = { killall_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, killall_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/killrefs/killrefs.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/killrefs/killrefs.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/killrefs/killrefs.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -130,7 +130,7 @@
const struct ged_cmd killrefs_cmd = { &killrefs_cmd_impl };
const struct ged_cmd *killrefs_cmds[] = { &killrefs_cmd, NULL };
-static const struct ged_plugin pinfo = { killrefs_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, killrefs_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/killtree/killtree.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/killtree/killtree.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/killtree/killtree.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -269,7 +269,7 @@
const struct ged_cmd killtree_cmd = { &killtree_cmd_impl };
const struct ged_cmd *killtree_cmds[] = { &killtree_cmd, NULL };
-static const struct ged_plugin pinfo = { killtree_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, killtree_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/label/label.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/label/label.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/label/label.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -60,7 +60,7 @@
const struct ged_cmd label_cmd = { &label_cmd_impl };
const struct ged_cmd *label_cmds[] = { &label_cmd, NULL };
-static const struct ged_plugin pinfo = { label_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, label_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/lc/lc.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/lc/lc.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/lc/lc.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -480,7 +480,7 @@
const struct ged_cmd lc_cmd = { &lc_cmd_impl };
const struct ged_cmd *lc_cmds[] = { &lc_cmd, NULL };
-static const struct ged_plugin pinfo = { lc_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, lc_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/libfuncs/libfuncs.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/libfuncs/libfuncs.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/libfuncs/libfuncs.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -161,7 +161,7 @@
const struct ged_cmd *mat4x3pnt_cmds[] = { &mat4x3pnt_cmd, &mat_ae_cmd,
&mat_mul_cmd, &mat_scale_about_pnt_cmd, NULL };
-static const struct ged_plugin pinfo = { mat4x3pnt_cmds, 4 };
+static const struct ged_plugin pinfo = { GED_API, mat4x3pnt_cmds, 4 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/lint/lint.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/lint/lint.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/lint/lint.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -612,7 +612,7 @@
const struct ged_cmd lint_cmd = { &lint_cmd_impl };
const struct ged_cmd *lint_cmds[] = { &lint_cmd, NULL };
- static const struct ged_plugin pinfo = { lint_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, lint_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/list/list.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/list/list.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/list/list.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -145,7 +145,7 @@
const struct ged_cmd *list_cmds[] = { &list_cmd, &l_cmd, NULL };
-static const struct ged_plugin pinfo = { list_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, list_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/lod/lod.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/lod/lod.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/lod/lod.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -143,7 +143,7 @@
const struct ged_cmd lod_cmd = { &lod_cmd_impl };
const struct ged_cmd *lod_cmds[] = { &lod_cmd, NULL };
-static const struct ged_plugin pinfo = { lod_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, lod_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/log/log.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/log/log.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/log/log.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -103,7 +103,7 @@
const struct ged_cmd log_cmd = { &log_cmd_impl };
const struct ged_cmd *log_cmds[] = { &log_cmd, NULL };
-static const struct ged_plugin pinfo = { log_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, log_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/lookat/lookat.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/lookat/lookat.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/lookat/lookat.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -119,7 +119,7 @@
const struct ged_cmd lookat_cmd = { &lookat_cmd_impl };
const struct ged_cmd *lookat_cmds[] = { &lookat_cmd, NULL };
-static const struct ged_plugin pinfo = { lookat_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, lookat_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/ls/ls.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/ls/ls.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/ls/ls.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -487,7 +487,7 @@
const struct ged_cmd *ls_cmds[] = { &ls_cmd, &t_cmd, NULL };
-static const struct ged_plugin pinfo = { ls_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, ls_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/lt/lt.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/lt/lt.c 2020-08-15 14:25:49 UTC (rev
76788)
+++ brlcad/branches/RELEASE/src/libged/lt/lt.c 2020-08-15 14:31:44 UTC (rev
76789)
@@ -176,7 +176,7 @@
const struct ged_cmd lt_cmd = { <_cmd_impl };
const struct ged_cmd *lt_cmds[] = { <_cmd, NULL };
-static const struct ged_plugin pinfo = { lt_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, lt_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/m2v_point/m2v_point.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/m2v_point/m2v_point.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/m2v_point/m2v_point.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -101,7 +101,7 @@
const struct ged_cmd m2v_point_cmd = { &m2v_point_cmd_impl };
const struct ged_cmd *m2v_point_cmds[] = { &m2v_point_cmd, NULL };
-static const struct ged_plugin pinfo = { m2v_point_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, m2v_point_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/make/make.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/make/make.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/make/make.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -937,7 +937,7 @@
const struct ged_cmd make_cmd = { &make_cmd_impl };
const struct ged_cmd *make_cmds[] = { &make_cmd, NULL };
-static const struct ged_plugin pinfo = { make_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, make_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/make_name/make_name.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/make_name/make_name.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/make_name/make_name.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -110,7 +110,7 @@
const struct ged_cmd make_name_cmd = { &make_name_cmd_impl };
const struct ged_cmd *make_name_cmds[] = { &make_name_cmd, NULL };
-static const struct ged_plugin pinfo = { make_name_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, make_name_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/match/match.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/match/match.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/match/match.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -87,7 +87,7 @@
const struct ged_cmd match_cmd = { &match_cmd_impl };
const struct ged_cmd *match_cmds[] = { &match_cmd, NULL };
-static const struct ged_plugin pinfo = { match_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, match_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/mater/mater.cpp
===================================================================
--- brlcad/branches/RELEASE/src/libged/mater/mater.cpp 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/mater/mater.cpp 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -1717,7 +1717,7 @@
const struct ged_cmd mater_cmd = { &mater_cmd_impl };
const struct ged_cmd *mater_cmds[] = { &mater_cmd, NULL };
- static const struct ged_plugin pinfo = { mater_cmds, 1 };
+ static const struct ged_plugin pinfo = { GED_API, mater_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/metaball/metaball.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/metaball/metaball.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/metaball/metaball.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -561,7 +561,7 @@
const struct ged_cmd *metaball_cmds[] = { &metaball_delete_pnt_cmd,
&metaball_mouse_move_pnt_cmd, &metaball_move_pnt_cmd, &metaball_add_pnt_cmd,
NULL };
-static const struct ged_plugin pinfo = { metaball_cmds, 4 };
+static const struct ged_plugin pinfo = { GED_API, metaball_cmds, 4 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/mirror/mirror.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/mirror/mirror.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/mirror/mirror.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -228,7 +228,7 @@
const struct ged_cmd mirror_cmd = { &mirror_cmd_impl };
const struct ged_cmd *mirror_cmds[] = { &mirror_cmd, NULL };
-static const struct ged_plugin pinfo = { mirror_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, mirror_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/model2grid_lu/model2grid_lu.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/model2grid_lu/model2grid_lu.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/model2grid_lu/model2grid_lu.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -86,7 +86,7 @@
const struct ged_cmd model2grid_lu_cmd = { &model2grid_lu_cmd_impl };
const struct ged_cmd *model2grid_lu_cmds[] = { &model2grid_lu_cmd, NULL };
-static const struct ged_plugin pinfo = { model2grid_lu_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, model2grid_lu_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/model2view/model2view.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/model2view/model2view.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/model2view/model2view.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -80,7 +80,7 @@
const struct ged_cmd model2view_cmd = { &model2view_cmd_impl };
const struct ged_cmd *model2view_cmds[] = { &model2view_cmd, NULL };
-static const struct ged_plugin pinfo = { model2view_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, model2view_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/model2view_lu/model2view_lu.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/model2view_lu/model2view_lu.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/model2view_lu/model2view_lu.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -80,7 +80,7 @@
const struct ged_cmd model2view_lu_cmd = { &model2view_lu_cmd_impl };
const struct ged_cmd *model2view_lu_cmds[] = { &model2view_lu_cmd, NULL };
-static const struct ged_plugin pinfo = { model2view_lu_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, model2view_lu_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/move/move.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/move/move.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/move/move.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -133,7 +133,7 @@
const struct ged_cmd *move_cmds[] = { &move_cmd, &mv_cmd, NULL };
-static const struct ged_plugin pinfo = { move_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, move_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/move_all/move_all.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/move_all/move_all.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/move_all/move_all.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -323,7 +323,7 @@
const struct ged_cmd *move_all_cmds[] = { &move_all_cmd, &mvall_cmd, NULL };
-static const struct ged_plugin pinfo = { move_all_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, move_all_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/move_arb_edge/move_arb_edge.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/move_arb_edge/move_arb_edge.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/move_arb_edge/move_arb_edge.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -315,7 +315,7 @@
const struct ged_cmd *move_arb_edge_cmds[] = { &move_arb_edge_cmd,
&find_arb_edge_cmd, NULL };
-static const struct ged_plugin pinfo = { move_arb_edge_cmds, 2 };
+static const struct ged_plugin pinfo = { GED_API, move_arb_edge_cmds, 2 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/move_arb_face/move_arb_face.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/move_arb_face/move_arb_face.c
2020-08-15 14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/move_arb_face/move_arb_face.c
2020-08-15 14:31:44 UTC (rev 76789)
@@ -253,7 +253,7 @@
const struct ged_cmd move_arb_face_cmd = { &move_arb_face_cmd_impl };
const struct ged_cmd *move_arb_face_cmds[] = { &move_arb_face_cmd, NULL };
-static const struct ged_plugin pinfo = { move_arb_face_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, move_arb_face_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/mrot/mrot.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/mrot/mrot.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/mrot/mrot.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -80,7 +80,7 @@
const struct ged_cmd mrot_cmd = { &mrot_cmd_impl };
const struct ged_cmd *mrot_cmds[] = { &mrot_cmd, NULL };
-static const struct ged_plugin pinfo = { mrot_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, mrot_cmds, 1 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/nirt/nirt.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/nirt/nirt.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/nirt/nirt.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -515,7 +515,7 @@
const struct ged_cmd *nirt_cmds[] = { &nirt_cmd, &vnirt_cmd, &query_ray_cmd,
&vquery_ray_cmd, NULL };
-static const struct ged_plugin pinfo = { nirt_cmds, 4 };
+static const struct ged_plugin pinfo = { GED_API, nirt_cmds, 4 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/nmg/nmg.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/nmg/nmg.c 2020-08-15 14:25:49 UTC
(rev 76788)
+++ brlcad/branches/RELEASE/src/libged/nmg/nmg.c 2020-08-15 14:31:44 UTC
(rev 76789)
@@ -182,7 +182,7 @@
NULL
};
-static const struct ged_plugin pinfo = { nmg_cmds, 10 };
+static const struct ged_plugin pinfo = { GED_API, nmg_cmds, 10 };
COMPILER_DLLEXPORT const struct ged_plugin *ged_plugin_info()
{
Modified: brlcad/branches/RELEASE/src/libged/ocenter/ocenter.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/ocenter/ocenter.c 2020-08-15
14:25:49 UTC (rev 76788)
+++ brlcad/branches/RELEASE/src/libged/ocenter/ocenter.c 2020-08-15
14:31:44 UTC (rev 76789)
@@ -133,7 +133,7 @@
const struct ged_cmd ocenter_cmd = { &ocenter_cmd_impl };
const struct ged_cmd *ocenter_cmds[] = { &ocenter_cmd, NULL };
-static const struct ged_plugin pinfo = { ocenter_cmds, 1 };
+static const struct ged_plugin pinfo = { GED_API, ocenter_cmds, 1 };
@@ Diff output truncated at 100000 characters. @@
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