[Commit-gnuradio] r7296 - gnuradio/branches/releases/3.1

[jcorgan]

Author: jcorgan
Date: 2007-12-27 14:16:37 -0700 (Thu, 27 Dec 2007)
New Revision: 7296

Modified:
   gnuradio/branches/releases/3.1/configure.ac
Log:
Applied changeset r7062 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/configure.ac
===================================================================
--- gnuradio/branches/releases/3.1/configure.ac 2007-12-27 21:15:03 UTC (rev 
7295)
+++ gnuradio/branches/releases/3.1/configure.ac 2007-12-27 21:16:37 UTC (rev 
7296)
@@ -112,6 +112,7 @@
 AC_CHECK_HEADERS(fcntl.h limits.h strings.h time.h sys/ioctl.h sys/time.h 
unistd.h)
 AC_CHECK_HEADERS(linux/ppdev.h sys/mman.h sys/select.h sys/types.h)
 AC_CHECK_HEADERS(sys/resource.h stdint.h sched.h signal.h sys/syscall.h)
+AC_CHECK_HEADERS(windows.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -154,6 +155,10 @@
   return pow(10.0, x);
 }
 #endif
+
+#ifdef HAVE_WINDOWS_H
+#define NOMINMAX
+#endif
 ])
 
 GR_CHECK_SHM_OPEN