Index: include/bu/sort.h =================================================================== --- include/bu/sort.h (revision 63588) +++ include/bu/sort.h (working copy) @@ -44,6 +44,26 @@ BU_EXPORT extern void bu_sort(void *array, size_t nummemb, size_t sizememb, int (*compare)(const void *, const void *, void *), void *context); +#ifndef BU_SORT_H +const char *binu_types[] = { + NULL, + NULL, + "binary(float)", + "binary(double)", + "binary(u_8bit_int)", + "binary(u_16bit_int)", + "binary(u_32bit_int)", + "binary(u_64bit_int)", + NULL, + NULL, + NULL, + NULL, + "binary(8bit_int)", + "binary(16bit_int)", + "binary(32bit_int)", + "binary(64bit_int)" +}; +#endif /** @} */ Index: src/librt/binunif/db5_bin.c =================================================================== --- src/librt/binunif/db5_bin.c (revision 63588) +++ src/librt/binunif/db5_bin.c (working copy) @@ -37,7 +37,7 @@ #endif #include "bio.h" - +#include "bu/sort.h" #include "bu/cv.h" #include "bu/parse.h" #include "vmath.h" Index: src/librt/globals.c =================================================================== --- src/librt/globals.c (revision 63588) +++ src/librt/globals.c (working copy) @@ -52,25 +52,8 @@ * this array depends on the values of the definitions of the * DB5_MINORTYPE_BINU_* in db5.h */ -const char *binu_types[] = { - NULL, - NULL, - "binary(float)", - "binary(double)", - "binary(u_8bit_int)", - "binary(u_16bit_int)", - "binary(u_32bit_int)", - "binary(u_64bit_int)", - NULL, - NULL, - NULL, - NULL, - "binary(8bit_int)", - "binary(16bit_int)", - "binary(32bit_int)", - "binary(64bit_int)" -}; + /** * Number of bytes used for each value of DB5HDR_WIDTHCODE_* */