updated pats contact and mothur header info

[mothur.git] / mothur.h

diff --git a/mothur.h b/mothur.h
index b27c5ada91ff59289856373122b3c4219ee1b965..c5afe86a79a9e92c789735ea3b1be3d33accf66a 100644 (file)
--- a/mothur.h
+++ b/mothur.h
@@ -44,8 +44,12 @@
 #include <cerrno>
 #include <ctime>
 #include <limits>
-#include <sys/wait.h>
-#include <unistd.h>
+
+
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+       #include <sys/wait.h>
+       #include <unistd.h>
+#endif
 
 using namespace std;
 
@@ -177,7 +181,7 @@ inline string getline(ifstream& fileHandle) {
                        char c = fileHandle.get(); 
                        
                        //are you at the end of the line
-                       if (c == 10 || c == 13){   break;       }       
+                       if ((c == '\n') || (c == '\r') || (c == '\f')){   break;        }       
                        else {          line += c;              }
                }
                
@@ -253,7 +257,7 @@ inline void errorOut(exception& e, string object, string function) {
        
                mothurOut("Error: ");
                mothurOut(toString(e.what()));
-               mothurOut(" has occurred in the " + object + " class function " + function + ". Please contact Pat Schloss at pschloss@microbio.umass.edu, and be sure to include the mothur.logFile with your inquiry.");
+               mothurOut(" has occurred in the " + object + " class function " + function + ". Please contact Pat Schloss at pschloss@umich.edu, and be sure to include the mothur.logFile with your inquiry.");
                mothurOutEndLine();
        
 }