make "make distcheck" work

[lyx.git] / src / support / userinfo.C

diff --git a/src/support/userinfo.C b/src/support/userinfo.C
index 7ecbc16b6bfe613c7b959cd4d2e01edf186a4934..758ce34572a9e0e8f755ec938a66c5989fc2c01f 100644 (file)
--- a/src/support/userinfo.C
+++ b/src/support/userinfo.C
@@ -10,15 +10,19 @@
 
 #include <config.h>
 
-#include "userinfo.h"
-#include "filetools.h"
+#include "support/userinfo.h"
+#include "support/environment.h"
 
 #include <boost/assert.hpp>
 
 #include <pwd.h>
-#include <unistd.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <sys/types.h>
 
+using std::string;
+
 namespace lyx {
 namespace support {
 
@@ -36,9 +40,9 @@ string const user_name()
 
 string const user_email()
 {
-       string email = GetEnv("EMAIL_ADDRESS");
+       string email = getEnv("EMAIL_ADDRESS");
        if (email.empty())
-               email = GetEnv("EMAIL");
+               email = getEnv("EMAIL");
        return email;
 }