Revision: 75722
http://sourceforge.net/p/brlcad/code/75722
Author: starseeker
Date: 2020-05-07 14:14:40 +0000 (Thu, 07 May 2020)
Log Message:
-----------
Push remainder of bio.h header inclusions down into source files. Only build
tested on Linux thus far.
Modified Paths:
--------------
brlcad/branches/bioh/include/brep/defines.h
brlcad/branches/bioh/include/bu/tc.h
brlcad/branches/bioh/include/fb/fb_osgl.h
brlcad/branches/bioh/include/fb/fb_wgl.h
brlcad/branches/bioh/include/fb.h
brlcad/branches/bioh/src/burst/ui.c
brlcad/branches/bioh/src/fb/bw-fb.c
brlcad/branches/bioh/src/fb/fb-bw.c
brlcad/branches/bioh/src/fb/fb-pix.c
brlcad/branches/bioh/src/fb/fb-png.c
brlcad/branches/bioh/src/fb/fbcbars.c
brlcad/branches/bioh/src/fb/fbcmap.c
brlcad/branches/bioh/src/fb/fbcolor.c
brlcad/branches/bioh/src/fb/fbfade.c
brlcad/branches/bioh/src/fb/fbframe.c
brlcad/branches/bioh/src/fb/fbgrid.c
brlcad/branches/bioh/src/fb/fbpoint.c
brlcad/branches/bioh/src/fb/fbstretch.c
brlcad/branches/bioh/src/fb/fbzoom.c
brlcad/branches/bioh/src/fb/gif-fb.c
brlcad/branches/bioh/src/fb/gif2fb.c
brlcad/branches/bioh/src/fb/pix-fb.c
brlcad/branches/bioh/src/fb/plot3-fb.c
brlcad/branches/bioh/src/fb/png-fb.c
brlcad/branches/bioh/src/fb/spm-fb.c
brlcad/branches/bioh/src/gtools/ganalyze.cpp
brlcad/branches/bioh/src/halftone/main.c
brlcad/branches/bioh/src/libfb/fbserv_obj.c
brlcad/branches/bioh/src/libfb/if_X24.c
brlcad/branches/bioh/src/libfb/if_disk.c
brlcad/branches/bioh/src/libfb/if_tk.c
brlcad/branches/bioh/src/libged/bot_dump.c
brlcad/branches/bioh/src/libged/editit.c
brlcad/branches/bioh/src/libged/facetize_log.c
brlcad/branches/bioh/src/libged/fb2pix.c
brlcad/branches/bioh/src/libged/pix2fb.c
brlcad/branches/bioh/src/libged/tables.c
brlcad/branches/bioh/src/librt/cache.c
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
brlcad/branches/bioh/src/mged/cmd.c
brlcad/branches/bioh/src/mged/fbserv.c
brlcad/branches/bioh/src/mged/mged.c
brlcad/branches/bioh/src/mged/plot.c
brlcad/branches/bioh/src/remrt/rtsrv.c
brlcad/branches/bioh/src/rt/do.c
brlcad/branches/bioh/src/rt/main.c
brlcad/branches/bioh/src/sig/ddisp.c
brlcad/branches/bioh/src/util/bw-a.c
brlcad/branches/bioh/src/util/bw-png.c
brlcad/branches/bioh/src/util/bwhist.c
brlcad/branches/bioh/src/util/double-asc.c
brlcad/branches/bioh/src/util/pix-png.c
brlcad/branches/bioh/src/util/pix-ppm.c
brlcad/branches/bioh/src/util/pixbgstrip.c
brlcad/branches/bioh/src/util/pixborder.c
brlcad/branches/bioh/src/util/pixelswap.c
brlcad/branches/bioh/src/util/pixhalve.c
brlcad/branches/bioh/src/util/pixhist.c
brlcad/branches/bioh/src/util/pixhist3d.c
brlcad/branches/bioh/src/util/pixmorph.c
brlcad/branches/bioh/src/util/wavelet.c
Modified: brlcad/branches/bioh/include/brep/defines.h
===================================================================
--- brlcad/branches/bioh/include/brep/defines.h 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/include/brep/defines.h 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,7 +29,25 @@
#include "common.h"
-#include "bio.h" /* needed to include windows.h with protections */
+/* We need to include windows.h with protections,
+ * rather than having opennurbs.h do it */
+#ifdef HAVE_WINDOWS_H
+# ifdef WIN32_LEAN_AND_MEAN
+# undef WIN32_LEAN_AND_MEAN
+# endif
+# define WIN32_LEAN_AND_MEAN 434144 /* don't want winsock.h */
+
+# ifdef NOMINMAX
+# undef NOMINMAX
+# endif
+# define NOMINMAX 434144 /* don't break std::min and std::max */
+
+# include <windows.h>
+
+# undef WIN32_LEAN_AND_MEAN /* unset to not interfere with calling apps */
+# undef NOMINMAX
+#endif
+
#ifdef __cplusplus
Modified: brlcad/branches/bioh/include/bu/tc.h
===================================================================
--- brlcad/branches/bioh/include/bu/tc.h 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/include/bu/tc.h 2020-05-07 14:14:40 UTC (rev
75722)
@@ -35,7 +35,6 @@
#include "common.h"
#include "bu/defines.h"
-#include "bio.h"
__BEGIN_DECLS
@@ -43,6 +42,21 @@
# include <pthread.h>
#endif
#if defined(HAVE_WINDOWS_H)
+# ifdef WIN32_LEAN_AND_MEAN
+# undef WIN32_LEAN_AND_MEAN
+# endif
+# define WIN32_LEAN_AND_MEAN 434144 /* don't want winsock.h */
+
+# ifdef NOMINMAX
+# undef NOMINMAX
+# endif
+# define NOMINMAX 434144 /* don't break std::min and std::max */
+
+# include <windows.h>
+
+# undef WIN32_LEAN_AND_MEAN /* unset to not interfere with calling apps */
+# undef NOMINMAX
+
# include <process.h>
# include <sys/timeb.h>
#endif
Modified: brlcad/branches/bioh/include/fb/fb_osgl.h
===================================================================
--- brlcad/branches/bioh/include/fb/fb_osgl.h 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/include/fb/fb_osgl.h 2020-05-07 14:14:40 UTC (rev
75722)
@@ -54,8 +54,6 @@
# include <sys/wait.h>
#endif
-#include "bio.h"
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: brlcad/branches/bioh/include/fb/fb_wgl.h
===================================================================
--- brlcad/branches/bioh/include/fb/fb_wgl.h 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/include/fb/fb_wgl.h 2020-05-07 14:14:40 UTC (rev
75722)
@@ -32,7 +32,22 @@
#ifdef FB_USE_INTERNAL_API
#ifdef IF_WGL
# include "common.h"
-# include "bio.h"
+
+# ifdef WIN32_LEAN_AND_MEAN
+# undef WIN32_LEAN_AND_MEAN
+# endif
+# define WIN32_LEAN_AND_MEAN 434144 /* don't want winsock.h */
+
+# ifdef NOMINMAX
+# undef NOMINMAX
+# endif
+# define NOMINMAX 434144 /* don't break std::min and std::max */
+
+# include <windows.h>
+
+# undef WIN32_LEAN_AND_MEAN /* unset to not interfere with calling apps */
+# undef NOMINMAX
+
/* The wgl interface as currently implemented uses some
* X11 types, supplied by Tk. */
# include <tk.h>
Modified: brlcad/branches/bioh/include/fb.h
===================================================================
--- brlcad/branches/bioh/include/fb.h 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/include/fb.h 2020-05-07 14:14:40 UTC (rev 75722)
@@ -54,9 +54,9 @@
#if defined(HAVE_SYS_TIME_H)
# include <sys/time.h>
#endif
+#include <stdio.h> /* for FILE */
#include "bsocket.h"
-#include "bio.h"
#include "tcl.h"
#include "pkg.h"
Modified: brlcad/branches/bioh/src/burst/ui.c
===================================================================
--- brlcad/branches/bioh/src/burst/ui.c 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/src/burst/ui.c 2020-05-07 14:14:40 UTC (rev 75722)
@@ -26,12 +26,13 @@
#include "common.h"
#include <assert.h>
-#include <stdio.h>
#include <signal.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include "bio.h"
+
#include "vmath.h"
#include "raytrace.h"
Modified: brlcad/branches/bioh/src/fb/bw-fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/bw-fb.c 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/src/fb/bw-fb.c 2020-05-07 14:14:40 UTC (rev 75722)
@@ -36,6 +36,9 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
+
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/fb/fb-bw.c
===================================================================
--- brlcad/branches/bioh/src/fb/fb-bw.c 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/src/fb/fb-bw.c 2020-05-07 14:14:40 UTC (rev 75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fb-pix.c
===================================================================
--- brlcad/branches/bioh/src/fb/fb-pix.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fb-pix.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
#include <sys/stat.h>
+#include "bio.h"
+
#include "bu/app.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fb-png.c
===================================================================
--- brlcad/branches/bioh/src/fb/fb-png.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fb-png.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -31,6 +31,8 @@
#include <sys/stat.h>
#include "png.h"
+#include "bio.h"
+
#include "bu/app.h"
#include "bu/getopt.h"
#include "bu/log.h"
Modified: brlcad/branches/bioh/src/fb/fbcbars.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbcbars.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbcbars.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -62,6 +62,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fbcmap.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbcmap.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbcmap.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -30,6 +30,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/getopt.h"
#include "bu/log.h"
#include "bu/snooze.h"
Modified: brlcad/branches/bioh/src/fb/fbcolor.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbcolor.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbcolor.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -30,6 +30,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fbfade.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbfade.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbfade.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -59,6 +59,8 @@
#include <string.h>
#include <stdarg.h>
+#include "bio.h"
+
#include "bu/getopt.h"
#include "vmath.h"
#include "fb.h" /* BRL-CAD package libfb.a interface */
Modified: brlcad/branches/bioh/src/fb/fbframe.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbframe.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbframe.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fbgrid.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbgrid.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbgrid.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -26,6 +26,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fbpoint.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbpoint.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbpoint.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/str.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/fb/fbstretch.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbstretch.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbstretch.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -77,6 +77,8 @@
#include <string.h>
#include <stdarg.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/getopt.h"
Modified: brlcad/branches/bioh/src/fb/fbzoom.c
===================================================================
--- brlcad/branches/bioh/src/fb/fbzoom.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/fbzoom.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/getopt.h"
#include "bu/log.h"
#include "vmath.h"
Modified: brlcad/branches/bioh/src/fb/gif-fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/gif-fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/gif-fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -72,6 +72,8 @@
#include <stdarg.h>
#include <limits.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/fb/gif2fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/gif2fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/gif2fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -42,6 +42,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/getopt.h"
#include "bu/exit.h"
#include "vmath.h"
Modified: brlcad/branches/bioh/src/fb/pix-fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/pix-fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/pix-fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -37,6 +37,8 @@
# include <winsock.h>
#endif
+#include "bio.h"
+
#include "bu/getopt.h"
#include "bu/malloc.h"
#include "bu/file.h"
Modified: brlcad/branches/bioh/src/fb/plot3-fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/plot3-fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/plot3-fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -77,6 +77,8 @@
#include <string.h>
#include <ctype.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/cv.h"
#include "bu/getopt.h"
Modified: brlcad/branches/bioh/src/fb/png-fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/png-fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/png-fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -27,6 +27,9 @@
#include "common.h"
#include <stdlib.h>
+
+#include "bio.h"
+
#include "png.h"
#include "bu/getopt.h"
Modified: brlcad/branches/bioh/src/fb/spm-fb.c
===================================================================
--- brlcad/branches/bioh/src/fb/spm-fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/fb/spm-fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -27,6 +27,8 @@
#include <stdlib.h>
#include <math.h>
+#include "bio.h"
+
#include "bu/exit.h"
#include "bu/getopt.h"
#include "fb.h"
Modified: brlcad/branches/bioh/src/gtools/ganalyze.cpp
===================================================================
--- brlcad/branches/bioh/src/gtools/ganalyze.cpp 2020-05-07 13:40:40 UTC
(rev 75721)
+++ brlcad/branches/bioh/src/gtools/ganalyze.cpp 2020-05-07 14:14:40 UTC
(rev 75722)
@@ -31,6 +31,8 @@
#include <signal.h>
#include <math.h>
+#include "bio.h"
+
#include "bu/log.h"
#include "bu/vls.h"
#include "raytrace.h"
Modified: brlcad/branches/bioh/src/halftone/main.c
===================================================================
--- brlcad/branches/bioh/src/halftone/main.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/halftone/main.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -68,6 +68,8 @@
#include <ctype.h>
#include <math.h>
+#include "bio.h"
+
#include "bu/getopt.h"
#include "vmath.h"
#include "raytrace.h"
Modified: brlcad/branches/bioh/src/libfb/fbserv_obj.c
===================================================================
--- brlcad/branches/bioh/src/libfb/fbserv_obj.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libfb/fbserv_obj.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -34,6 +34,7 @@
#include <string.h>
#include <ctype.h>
#include <tcl.h>
+#include "bio.h"
#include "bnetwork.h"
#include "raytrace.h"
Modified: brlcad/branches/bioh/src/libfb/if_X24.c
===================================================================
--- brlcad/branches/bioh/src/libfb/if_X24.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libfb/if_X24.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -70,6 +70,8 @@
#include <ctype.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/file.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/libfb/if_disk.c
===================================================================
--- brlcad/branches/bioh/src/libfb/if_disk.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libfb/if_disk.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -26,6 +26,8 @@
#include "common.h"
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/file.h"
#include "bu/log.h"
Modified: brlcad/branches/bioh/src/libfb/if_tk.c
===================================================================
--- brlcad/branches/bioh/src/libfb/if_tk.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libfb/if_tk.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -35,6 +35,7 @@
#include <string.h>
#include <tcl.h>
#include <tk.h>
+#include "bio.h"
#include "bnetwork.h"
#include "bu/color.h"
Modified: brlcad/branches/bioh/src/libged/bot_dump.c
===================================================================
--- brlcad/branches/bioh/src/libged/bot_dump.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libged/bot_dump.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -30,6 +30,7 @@
#include <sys/stat.h>
#include <string.h>
#include <ctype.h>
+#include "bio.h"
#include "bnetwork.h"
#include "bu/cv.h"
Modified: brlcad/branches/bioh/src/libged/editit.c
===================================================================
--- brlcad/branches/bioh/src/libged/editit.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libged/editit.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -32,6 +32,7 @@
# include <sys/types.h>
#endif
+#include "bio.h"
#include "bresource.h"
#include "bu/app.h"
Modified: brlcad/branches/bioh/src/libged/facetize_log.c
===================================================================
--- brlcad/branches/bioh/src/libged/facetize_log.c 2020-05-07 13:40:40 UTC
(rev 75721)
+++ brlcad/branches/bioh/src/libged/facetize_log.c 2020-05-07 14:14:40 UTC
(rev 75722)
@@ -27,6 +27,8 @@
#include <string.h>
+#include "bio.h"
+
#include "bu/hook.h"
#include "bu/vls.h"
#include "./ged_private.h"
Modified: brlcad/branches/bioh/src/libged/fb2pix.c
===================================================================
--- brlcad/branches/bioh/src/libged/fb2pix.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libged/fb2pix.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
#include <sys/stat.h>
+#include "bio.h"
+
#include "bu/app.h"
#include "bu/getopt.h"
#include "fb.h"
Modified: brlcad/branches/bioh/src/libged/pix2fb.c
===================================================================
--- brlcad/branches/bioh/src/libged/pix2fb.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libged/pix2fb.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -37,6 +37,8 @@
# include <winsock.h>
#endif
+#include "bio.h"
+
#include "bu/getopt.h"
#include "bu/snooze.h"
#include "fb.h"
Modified: brlcad/branches/bioh/src/libged/tables.c
===================================================================
--- brlcad/branches/bioh/src/libged/tables.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/libged/tables.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -35,6 +35,8 @@
#include <ctype.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/sort.h"
#include "bu/units.h"
#include "./ged_private.h"
Modified: brlcad/branches/bioh/src/librt/cache.c
===================================================================
--- brlcad/branches/bioh/src/librt/cache.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/librt/cache.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -37,6 +37,7 @@
#endif
#include "lz4.h"
+#include "bio.h"
#include "bnetwork.h"
/* implementation headers */
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-05-07 13:40:40 UTC
(rev 75721)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-05-07 14:14:40 UTC
(rev 75722)
@@ -31,6 +31,7 @@
#include "common.h"
+
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
@@ -42,6 +43,8 @@
#include "tcl.h"
+#include "bio.h"
+
#include "bn.h"
#include "bu/cmd.h"
#include "bu/path.h"
Modified: brlcad/branches/bioh/src/mged/cmd.c
===================================================================
--- brlcad/branches/bioh/src/mged/cmd.c 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/src/mged/cmd.c 2020-05-07 14:14:40 UTC (rev 75722)
@@ -36,6 +36,7 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
+#include "bio.h"
#include "bresource.h"
#include "tcl.h"
Modified: brlcad/branches/bioh/src/mged/fbserv.c
===================================================================
--- brlcad/branches/bioh/src/mged/fbserv.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/mged/fbserv.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,10 +29,9 @@
#include <stdlib.h>
#include <ctype.h>
+#include "bio.h"
#include "bnetwork.h"
-#ifndef HAVE_WINSOCK_H
-# include <sys/socket.h> /* TODO - should this be in bsocket.h? */
-#endif
+#include "bsocket.h"
#include "tcl.h"
#include "vmath.h"
Modified: brlcad/branches/bioh/src/mged/mged.c
===================================================================
--- brlcad/branches/bioh/src/mged/mged.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/mged/mged.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -44,15 +44,12 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#ifdef HAVE_SYS_SOCKET_H
-/* for recv */
-# include <sys/socket.h>
-#endif
#ifdef HAVE_POLL_H
# include <poll.h>
#endif
+#include "bio.h"
#include "bsocket.h"
#include "tcl.h"
Modified: brlcad/branches/bioh/src/mged/plot.c
===================================================================
--- brlcad/branches/bioh/src/mged/plot.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/mged/plot.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,7 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
+#include "bio.h"
#include "bresource.h"
#include "bu/app.h"
Modified: brlcad/branches/bioh/src/remrt/rtsrv.c
===================================================================
--- brlcad/branches/bioh/src/remrt/rtsrv.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/remrt/rtsrv.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -41,6 +41,7 @@
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
+#include "bio.h"
#include "bresource.h"
#include "bsocket.h"
Modified: brlcad/branches/bioh/src/rt/do.c
===================================================================
--- brlcad/branches/bioh/src/rt/do.c 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/src/rt/do.c 2020-05-07 14:14:40 UTC (rev 75722)
@@ -38,6 +38,8 @@
# include <sys/stat.h>
#endif
+#include "bio.h"
+
#include "bu/app.h"
#include "bu/getopt.h"
#include "bu/debug.h"
Modified: brlcad/branches/bioh/src/rt/main.c
===================================================================
--- brlcad/branches/bioh/src/rt/main.c 2020-05-07 13:40:40 UTC (rev 75721)
+++ brlcad/branches/bioh/src/rt/main.c 2020-05-07 14:14:40 UTC (rev 75722)
@@ -42,6 +42,8 @@
# include <mpi.h>
#endif
+#include "bio.h"
+
#include "bu/endian.h"
#include "bu/getopt.h"
#include "bu/bitv.h"
Modified: brlcad/branches/bioh/src/sig/ddisp.c
===================================================================
--- brlcad/branches/bioh/src/sig/ddisp.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/sig/ddisp.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -28,6 +28,8 @@
#include <string.h>
#include <stdlib.h>
+#include "bio.h"
+
#include "bu/malloc.h"
#include "bu/color.h"
#include "bu/str.h"
Modified: brlcad/branches/bioh/src/util/bw-a.c
===================================================================
--- brlcad/branches/bioh/src/util/bw-a.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/bw-a.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -38,6 +38,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/getopt.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/util/bw-png.c
===================================================================
--- brlcad/branches/bioh/src/util/bw-png.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/bw-png.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <math.h>
#include "png.h"
+#include "bio.h"
+
#include "vmath.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/util/bwhist.c
===================================================================
--- brlcad/branches/bioh/src/util/bwhist.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/bwhist.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -30,6 +30,8 @@
#include <ctype.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/str.h"
#include "bu/exit.h"
#include "fb.h"
Modified: brlcad/branches/bioh/src/util/double-asc.c
===================================================================
--- brlcad/branches/bioh/src/util/double-asc.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/double-asc.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -28,6 +28,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/util/pix-png.c
===================================================================
--- brlcad/branches/bioh/src/util/pix-png.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pix-png.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -33,6 +33,9 @@
#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
+
+#include "bio.h"
+
#include "png.h"
#include "vmath.h"
Modified: brlcad/branches/bioh/src/util/pix-ppm.c
===================================================================
--- brlcad/branches/bioh/src/util/pix-ppm.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pix-ppm.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/app.h"
#include "bu/getopt.h"
Modified: brlcad/branches/bioh/src/util/pixbgstrip.c
===================================================================
--- brlcad/branches/bioh/src/util/pixbgstrip.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixbgstrip.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -27,6 +27,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/util/pixborder.c
===================================================================
--- brlcad/branches/bioh/src/util/pixborder.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixborder.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
#include <math.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/color.h"
#include "bu/getopt.h"
Modified: brlcad/branches/bioh/src/util/pixelswap.c
===================================================================
--- brlcad/branches/bioh/src/util/pixelswap.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixelswap.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -28,6 +28,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/getopt.h"
#include "bu/exit.h"
#include "fb.h"
Modified: brlcad/branches/bioh/src/util/pixhalve.c
===================================================================
--- brlcad/branches/bioh/src/util/pixhalve.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixhalve.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -32,6 +32,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
Modified: brlcad/branches/bioh/src/util/pixhist.c
===================================================================
--- brlcad/branches/bioh/src/util/pixhist.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixhist.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -29,6 +29,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/log.h"
#include "bu/str.h"
Modified: brlcad/branches/bioh/src/util/pixhist3d.c
===================================================================
--- brlcad/branches/bioh/src/util/pixhist3d.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixhist3d.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -34,6 +34,8 @@
#include <stdlib.h>
#include <string.h>
+#include "bio.h"
+
#include "bu/color.h"
#include "bu/str.h"
#include "bu/exit.h"
Modified: brlcad/branches/bioh/src/util/pixmorph.c
===================================================================
--- brlcad/branches/bioh/src/util/pixmorph.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/pixmorph.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -42,6 +42,8 @@
#include <sys/stat.h>
#include <math.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/color.h"
#include "bu/getopt.h"
Modified: brlcad/branches/bioh/src/util/wavelet.c
===================================================================
--- brlcad/branches/bioh/src/util/wavelet.c 2020-05-07 13:40:40 UTC (rev
75721)
+++ brlcad/branches/bioh/src/util/wavelet.c 2020-05-07 14:14:40 UTC (rev
75722)
@@ -44,6 +44,8 @@
#include <stdlib.h>
+#include "bio.h"
+
#include "vmath.h"
#include "bu/getopt.h"
#include "bu/malloc.h"
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
