1.22.0

[mothur.git] / myutils.h

diff --git a/myutils.h b/myutils.h
index 6374c8bee360033277aba81f73e836ef9a86cc13..b63ad3cff91af09741a5d53865916f9781a53973 100644 (file)
--- a/myutils.h
+++ b/myutils.h
@@ -1,10 +1,8 @@
-//uchime by Robert C. Edgar http://drive5.com/uchime This code is donated to the public domain.\r
-\r
 #ifndef myutils_h\r
 #define myutils_h\r
 \r
 #define RCE_MALLOC     0\r
-\r
+
 #include <stdio.h>\r
 #include <sys/types.h>\r
 #include <string>\r
@@ -16,32 +14,30 @@
 #include <cstdlib>\r
 #include <climits>\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
-#else\r
+#ifndef _MSC_VER\r
 #include <inttypes.h>\r
 #endif\r
 \r
 using namespace std;\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
-#else\r
-//#include <crtdbg.h>\r
+#ifdef _MSC_VER\r
+#include <crtdbg.h>\r
 #pragma warning(disable: 4996) // deprecated functions\r
 #define _CRT_SECURE_NO_DEPRECATE       1\r
 #endif\r
 \r
-//#if defined(_DEBUG) && !defined(DEBUG)\r
+#if defined(_DEBUG) && !defined(DEBUG)\r
 #define DEBUG  1\r
-//#endif\r
+#endif\r
 \r
-//#if defined(DEBUG) && !defined(_DEBUG)\r
+#if defined(DEBUG) && !defined(_DEBUG)\r
 #define _DEBUG 1\r
-//#endif\r
+#endif\r
 \r
-//#ifndef NDEBUG\r
+#ifndef NDEBUG\r
 #define        DEBUG   1\r
 #define        _DEBUG  1\r
-//#endif\r
+#endif\r
 \r
 typedef unsigned char byte;\r
 typedef unsigned short uint16;\r
@@ -51,10 +47,10 @@ typedef double float32;
 typedef signed char int8;\r
 typedef unsigned char uint8;\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#ifdef _MSC_VER\r
 \r
-typedef long long int64;\r
-typedef unsigned long long uint64;\r
+typedef __int64 int64;\r
+typedef unsigned __int64 uint64;\r
 \r
 #define INT64_PRINTF           "lld"\r
 #define UINT64_PRINTF          "llu"\r
@@ -68,7 +64,6 @@ typedef unsigned long long uint64;
 #define SIZE_T_PRINTFX         "x"\r
 #define OFF64_T_PRINTFX                "llx"\r
 \r
-\r
 #elif defined(__x86_64__)\r
 \r
 typedef long int64;\r
@@ -88,8 +83,8 @@ typedef unsigned long uint64;
 \r
 #else\r
 \r
-typedef __int64 int64;\r
-typedef unsigned __int64 uint64;\r
+typedef long long int64;\r
+typedef unsigned long long uint64;\r
 \r
 #define INT64_PRINTF           "lld"\r
 #define UINT64_PRINTF          "llu"\r
@@ -102,7 +97,6 @@ typedef unsigned __int64 uint64;
 \r
 #define SIZE_T_PRINTFX         "x"\r
 #define OFF64_T_PRINTFX                "llx"\r
-\r
 #endif\r
 \r
 #define d64            INT64_PRINTF\r
@@ -164,8 +158,7 @@ void myfree(void *p);
 \r
 bool myisatty(int fd);\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
-#else\r
+#ifdef _MSC_VER\r
 #define off_t  __int64\r
 #endif\r
 \r
@@ -274,8 +267,8 @@ void GetCmdLine(string &s);
 \r
 extern const char *SVN_VERSION;\r
 extern const char *SVN_MODS;\r
-extern bool opt_quiet;\r
-extern bool opt_version;\r
-extern FILE *g_fLog;\r
+extern bool opt_quiet;
+extern bool opt_version;
+extern FILE *g_fLog;
 \r
 #endif // myutils_h\r