Revision: 75736
http://sourceforge.net/p/brlcad/code/75736
Author: starseeker
Date: 2020-05-07 19:02:00 +0000 (Thu, 07 May 2020)
Log Message:
-----------
bio.h is no longer forbidden in public headers (repository.sh comment was
outdated) so restore bio.h for windows.h inclusions for brevity.
Modified Paths:
--------------
brlcad/trunk/include/brep/defines.h
brlcad/trunk/include/bu/tc.h
brlcad/trunk/include/fb/fb_wgl.h
Modified: brlcad/trunk/include/brep/defines.h
===================================================================
--- brlcad/trunk/include/brep/defines.h 2020-05-07 18:52:47 UTC (rev 75735)
+++ brlcad/trunk/include/brep/defines.h 2020-05-07 19:02:00 UTC (rev 75736)
@@ -29,28 +29,12 @@
#include "common.h"
-/* 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 */
+/* We need a guarded windows.h inclusion, so use bio.h to get it before
+ * opennurbs.h pulls it in */
+#include "bio.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
-
/* Note - We aren't (yet) including opennurbs in our Doxygen output. Until we
* do, use cond to hide the opennurbs header from Doxygen. */
/* @cond */
Modified: brlcad/trunk/include/bu/tc.h
===================================================================
--- brlcad/trunk/include/bu/tc.h 2020-05-07 18:52:47 UTC (rev 75735)
+++ brlcad/trunk/include/bu/tc.h 2020-05-07 19:02:00 UTC (rev 75736)
@@ -36,6 +36,8 @@
#include "common.h"
#include "bu/defines.h"
+#include "bio.h" /* For windows.h */
+
__BEGIN_DECLS
#if defined(HAVE_PTHREAD_H)
@@ -42,26 +44,10 @@
# 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
-
#define bu_thrd_error 0 /**< The requested operation failed */
#define bu_thrd_success 1 /**< The requested operation succeeded */
#define bu_thrd_timedout 2 /**< The time specified in the call was reached
without acquiring the requested resource */
Modified: brlcad/trunk/include/fb/fb_wgl.h
===================================================================
--- brlcad/trunk/include/fb/fb_wgl.h 2020-05-07 18:52:47 UTC (rev 75735)
+++ brlcad/trunk/include/fb/fb_wgl.h 2020-05-07 19:02:00 UTC (rev 75736)
@@ -33,21 +33,8 @@
#ifdef IF_WGL
# include "common.h"
-# ifdef WIN32_LEAN_AND_MEAN
-# undef WIN32_LEAN_AND_MEAN
-# endif
-# define WIN32_LEAN_AND_MEAN 434144 /* don't want winsock.h */
+# include "bio.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>
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
