Merge branch 'maint'

Author: jmcorgan

CMakeLists.txt

@@ -148,6 +148,10 @@ if(MSVC)
     add_definitions(/bigobj) #allow for larger object files
 endif(MSVC)
 
+if(WIN32)
+	add_definitions(-D_USE_MATH_DEFINES)
+endif(WIN32)
+
 # Record Compiler Info for record
 STRING(TOUPPER ${CMAKE_BUILD_TYPE} GRCBTU)
 set(COMPILER_INFO "")

cmake/Modules/GrBoost.cmake

@@ -32,14 +32,9 @@ set(BOOST_REQUIRED_COMPONENTS
     filesystem
     system
     regex
+    thread
 )
 
-if (MINGW)
-	set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread_win32)
-else(MINGW)
-	set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread)
-endif(MINGW)
-
 if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
     list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
 endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")

cmake/msvc/config.h

@@ -21,7 +21,6 @@ typedef ptrdiff_t ssize_t;
 ////////////////////////////////////////////////////////////////////////
 // rint functions
 ////////////////////////////////////////////////////////////////////////
-#define _USE_MATH_DEFINES
 #include <math.h>
 #if _MSC_VER < 1800
 static inline long lrint(double x){return (long)(x > 0.0 ? x + 0.5 : x - 0.5);}
@@ -62,7 +61,4 @@ static inline float rintf(float x){return (x > 0.0f)? floorf(x + 0.5f) : ceilf(x
 static inline long int random (void) { return rand(); }
 static inline void srandom (unsigned int seed) { srand(seed); }
 
-#define srand48(seed) srand(seed)
-#define drand48() (double(rand()) / RAND_MAX)
-
 #endif // _MSC_CONFIG_H_ ]

gr-analog/lib/fastnoise_source_X_impl.cc.t

@@ -144,7 +144,7 @@ namespace gr {
 
     @TYPE@ @IMPL_NAME@::sample()
     {
-#ifdef __USE_GNU
+#ifdef HAVE_RAND48
         size_t idx = lrand48() % d_samples.size();
 #else
         size_t idx = rand() % d_samples.size();
@@ -153,7 +153,7 @@ namespace gr {
     }
 
 #ifndef FASTNOISE_RANDOM_SIGN
-#ifdef _MSC_VER
+#ifndef HAVE_RAND48
 #define FASTNOISE_RANDOM_SIGN       ((rand()%2==0)?1:-1)
 #else
 #define FASTNOISE_RANDOM_SIGN       ((lrand48()%2==0)?1:-1)

gr-blocks/lib/ConfigChecks.cmake

@@ -89,3 +89,10 @@ CHECK_CXX_SOURCE_COMPILES("
     " HAVE_COSF
 )
 GR_ADD_COND_DEF(HAVE_COSF)
+
+CHECK_CXX_SOURCE_COMPILES("
+    #include <stdlib.h>
+	int main(){srand48(0); drand48(); lrand48(); return 0;}
+	" HAVE_RAND48
+)
+GR_ADD_COND_DEF(HAVE_RAND48)

gr-blocks/lib/test_tag_variable_rate_ff_impl.cc

@@ -57,7 +57,11 @@ namespace gr {
       d_new_in = 0;
       d_last_out = 0;
 
+#ifdef HAVE_RAND48
       srand48(time(NULL));
+#else
+      srand(time(NULL));
+#endif
     }
 
     test_tag_variable_rate_ff_impl::~test_tag_variable_rate_ff_impl()
@@ -78,7 +82,11 @@ namespace gr {
       GR_LOG_DEBUG(d_logger, boost::format("noutput_items: %1%") % noutput_items);
 
       if(d_update_once) {
+#ifdef HAVE_RAND48
         if(drand48() > 0.5) {
+#else
+        if (rand() > RAND_MAX / 2) {
+#endif
           d_rrate += d_update_step;
         }
         else {
@@ -95,7 +103,11 @@ namespace gr {
       while(i < ninput_items[0]) {
 
         if(!d_update_once) {
+#ifdef HAVE_RAND48
           if(drand48() > 0.5) {
+#else
+          if (rand() > RAND_MAX / 2) {
+#endif
             d_rrate += d_update_step;
           }
           else {