Rename lock.h to platform.h

And move some more platform specific code there.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/misc.h b/src/misc.h
index 84ea9cd52b6e286af173ec7e53e1c493ecd26a26..8d21c1adfb3d328d48768a62e26bfd012527aca1 100644 (file)
--- a/src/misc.h
+++ b/src/misc.h
@@ -23,7 +23,6 @@
 #include <fstream>
 #include <string>
 
 #include <fstream>
 #include <string>
 

-#include "lock.h"

 #include "types.h"
 
 extern const std::string engine_info(bool to_uci = false);
 #include "types.h"
 
 extern const std::string engine_info(bool to_uci = false);

diff --git a/src/lock.h b/src/platform.h
similarity index 68%
rename from src/lock.h
rename to src/platform.h
index 85d32a5cbb0432753b500dd33e2f989f63ec8a35..26c3abfbb820d8bf999e7999b8214a7523c1689c 100644 (file)
--- a/src/lock.h
+++ b/src/platform.h
@@ -17,13 +17,40 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 

-#if !defined(LOCK_H_INCLUDED)
-#define LOCK_H_INCLUDED
+#if !defined(PLATFORM_H_INCLUDED)
+#define PLATFORM_H_INCLUDED

 
 

-#if !defined(_WIN32) && !defined(_WIN64)
+#if defined(_MSC_VER)

 
 

-#  include <pthread.h>
+// Disable some silly and noisy warning from MSVC compiler
+#pragma warning(disable: 4127) // Conditional expression is constant
+#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
+#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
+#pragma warning(disable: 4996) // Function _ftime() may be unsafe
+
+// MSVC does not support <inttypes.h>
+typedef   signed __int8    int8_t;
+typedef unsigned __int8   uint8_t;
+typedef   signed __int16  int16_t;
+typedef unsigned __int16 uint16_t;
+typedef   signed __int32  int32_t;
+typedef unsigned __int32 uint32_t;
+typedef   signed __int64  int64_t;
+typedef unsigned __int64 uint64_t;
+
+#else
+#  include <inttypes.h>
+#endif
+
+#if !defined(_WIN32) && !defined(_WIN64) // Linux - Unix

 
 

+#  include <sys/time.h>
+typedef timeval sys_time_t;
+
+inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); }
+inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; }
+
+#  include <pthread.h>

 typedef pthread_mutex_t Lock;
 typedef pthread_cond_t WaitCondition;
 typedef pthread_t ThreadHandle;
 typedef pthread_mutex_t Lock;
 typedef pthread_cond_t WaitCondition;
 typedef pthread_t ThreadHandle;


@@ -41,7 +68,13 @@ typedef void*(*start_fn)(void*);
 #  define thread_create(x,f,id) !pthread_create(&(x),NULL,(start_fn)f,&(id))
 #  define thread_join(x) pthread_join(x, NULL)
 
 #  define thread_create(x,f,id) !pthread_create(&(x),NULL,(start_fn)f,&(id))
 #  define thread_join(x) pthread_join(x, NULL)
 

-#else
+#else // Windows and MinGW
+
+#  include <sys/timeb.h>
+typedef _timeb sys_time_t;
+
+inline void system_time(sys_time_t* t) { _ftime(t); }
+inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; }

 
 #if !defined(NOMINMAX)
 #  define NOMINMAX // disable macros min() and max()
 
 #if !defined(NOMINMAX)
 #  define NOMINMAX // disable macros min() and max()


@@ -73,4 +106,4 @@ typedef HANDLE ThreadHandle;
 
 #endif
 
 
 #endif
 

-#endif // !defined(LOCK_H_INCLUDED)
+#endif // !defined(PLATFORM_H_INCLUDED)

diff --git a/src/thread.h b/src/thread.h
index 11c8778d8e21e4ce8a5c603fecb0e74981509a5e..e71db835734d7bd2bc146b0cf71332e0d9b6ca61 100644 (file)
--- a/src/thread.h
+++ b/src/thread.h
@@ -22,7 +22,6 @@
 
 #include <set>
 
 
 #include <set>
 

-#include "lock.h"

 #include "material.h"
 #include "movepick.h"
 #include "pawns.h"
 #include "material.h"
 #include "movepick.h"
 #include "pawns.h"

diff --git a/src/types.h b/src/types.h
index 9567d6b851a0a8ec8d0cae53419e0aa71531e4de..7de31d45f67853de4e3ea498c59157dce55c4b91 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -38,41 +38,7 @@
 #include <climits>
 #include <cstdlib>
 
 #include <climits>
 #include <cstdlib>
 

-#if defined(_MSC_VER)
-
-// Disable some silly and noisy warning from MSVC compiler
-#pragma warning(disable: 4127) // Conditional expression is constant
-#pragma warning(disable: 4146) // Unary minus operator applied to unsigned type
-#pragma warning(disable: 4800) // Forcing value to bool 'true' or 'false'
-#pragma warning(disable: 4996) // Function _ftime() may be unsafe
-
-// MSVC does not support <inttypes.h>
-typedef   signed __int8    int8_t;
-typedef unsigned __int8   uint8_t;
-typedef   signed __int16  int16_t;
-typedef unsigned __int16 uint16_t;
-typedef   signed __int32  int32_t;
-typedef unsigned __int32 uint32_t;
-typedef   signed __int64  int64_t;
-typedef unsigned __int64 uint64_t;
-
-#else
-#  include <inttypes.h>
-#endif
-
-#if defined(_WIN32) || defined(_WIN64)
-#  include <sys/timeb.h>
-typedef _timeb sys_time_t;
-
-inline void system_time(sys_time_t* t) { _ftime(t); }
-inline uint64_t time_to_msec(const sys_time_t& t) { return t.time * 1000LL + t.millitm; }
-#else
-#  include <sys/time.h>
-typedef timeval sys_time_t;
-
-inline void system_time(sys_time_t* t) { gettimeofday(t, NULL); }
-inline uint64_t time_to_msec(const sys_time_t& t) { return t.tv_sec * 1000LL + t.tv_usec / 1000; }
-#endif
+#include "platform.h"

 
 #if defined(_WIN64)
 #  include <intrin.h> // MSVC popcnt and bsfq instrinsics
 
 #if defined(_WIN64)
 #  include <intrin.h> // MSVC popcnt and bsfq instrinsics