Merge pull request #392 from unix-ninja/master

Various refactor changes

include/common.h

@@ -38,17 +38,17 @@
 #include <semaphore.h>
 #include <dlfcn.h>
 #include <pwd.h>
+#include <limits.h>
 
 #ifdef LINUX
 #include <termio.h>
 #endif
 
-#ifdef OSX
+#ifdef DARWIN
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <mach-o/dyld.h>
 #include <mach/mach.h>
-#include <limits.h>
 #endif
 
 typedef void *OCL_LIB;
@@ -58,7 +58,7 @@ typedef void *ADL_LIB;
 typedef void *NVAPI_LIB;
 typedef void *NVML_LIB;
 typedef void *XNVCTRL_LIB;
-#ifdef OSX
+#ifdef DARWIN
 #define __stdcall
 #endif
 #endif

include/ext_OpenCL.h

@@ -13,7 +13,7 @@
 #define CL_USE_DEPRECATED_OPENCL_1_2_APIS
 #define CL_USE_DEPRECATED_OPENCL_2_0_APIS
 
-#ifdef OSX
+#ifdef DARWIN
 #include <OpenCL/cl.h>
 #endif
 

include/shared.h

@@ -46,7 +46,7 @@
 #define hc_thread_mutex_delete(m)   pthread_mutex_destroy  (&m)
 #endif
 
-#ifdef OSX
+#ifdef DARWIN
 typedef struct cpu_set
 {
   uint32_t count;

include/types.h

@@ -6,6 +6,12 @@
 #ifndef TYPES_H
 #define TYPES_H
 
+#ifdef _WIN
+#define EOL "\r\n"
+#else
+#define EOL "\n"
+#endif
+
 typedef struct
 {
   uint salt_buf[16];