added unix to ifdefs. minor changes while testing 1.24.0.

[mothur.git] / myutils.cpp

diff --git a/myutils.cpp b/myutils.cpp
index 226b0f63560b04348ea425290c98b48b1abc4de6..b1846499021624c64733cb44afcc344fdfecbb37 100755 (executable)
--- a/myutils.cpp
+++ b/myutils.cpp
@@ -11,7 +11,7 @@
 #include <signal.h>\r
 #include <float.h>\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)\r
 #include <sys/time.h>\r
 #include <sys/resource.h>\r
 #include <unistd.h>\r
@@ -139,7 +139,7 @@ bool myisatty(int fd)
        return isatty(fd) != 0;\r
 }\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)\r
 #else\r
 //#ifdef BIT_VERSION\r
 //#include <io.h>\r
@@ -176,7 +176,7 @@ void LogStdioFileState(FILE *f)
        Log("fpos       %ld (retval %d)\n", (long) fpos, fgetpos_retval);\r
        //      Log("eof        %d\n", _eof(fd));\r
 #endif\r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)\r
 #else\r
 #ifdef BIT_VERSION\r
        __int64 pos64 = _ftelli64(f);\r
@@ -612,7 +612,7 @@ void Die(const char *Format, ...)
        fprintf(stderr, "\n---Fatal error---\n%s\n", szStr);\r
        Log("\n---Fatal error---\n%s\n", szStr);\r
        \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)\r
 #else\r
        //if (IsDebuggerPresent())\r
        //      __debugbreak();\r
@@ -1205,7 +1205,7 @@ static void AddOpt(const OptInfo &Opt)
        g_Opts.insert(Opt);\r
 }\r
 \r
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)\r
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)\r
 #else\r
 #pragma warning(disable: 4505) // unreferenced local function\r
 #endif\r