added count.seqs command and made some modifcations to the uchime code to allow it...

[mothur.git] / myutils.h

diff --git a/myutils.h b/myutils.h
index 61220546b81894283bb6350f5c2c51ecc8800cb2..6374c8bee360033277aba81f73e836ef9a86cc13 100644 (file)
--- a/myutils.h
+++ b/myutils.h
@@ -16,30 +16,32 @@
 #include <cstdlib>\r
 #include <climits>\r
 \r
-#ifndef _MSC_VER\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#else\r
 #include <inttypes.h>\r
 #endif\r
 \r
 using namespace std;\r
 \r
-#ifdef _MSC_VER\r
-#include <crtdbg.h>\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#else\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
@@ -49,10 +51,10 @@ typedef double float32;
 typedef signed char int8;\r
 typedef unsigned char uint8;\r
 \r
-#ifdef _MSC_VER\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\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
@@ -66,6 +68,7 @@ typedef unsigned __int64 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
@@ -85,8 +88,8 @@ typedef unsigned long uint64;
 \r
 #else\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
@@ -99,6 +102,7 @@ typedef unsigned long long uint64;
 \r
 #define SIZE_T_PRINTFX         "x"\r
 #define OFF64_T_PRINTFX                "llx"\r
+\r
 #endif\r
 \r
 #define d64            INT64_PRINTF\r
@@ -160,7 +164,8 @@ void myfree(void *p);
 \r
 bool myisatty(int fd);\r
 \r
-#ifdef _MSC_VER\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#else\r
 #define off_t  __int64\r
 #endif\r
 \r