#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;
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;
}