abdel likes short code

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

diff --git a/src/support/userinfo.cpp b/src/support/userinfo.cpp
index c68d55ac3e02b27d001b1496259142bba74ff605..ca4e0e948077be62c8dba20631e24ac14dc682b1 100644 (file)
--- a/src/support/userinfo.cpp
+++ b/src/support/userinfo.cpp
@@ -12,11 +12,12 @@
 
 #include "support/userinfo.h"
 #include "support/environment.h"
+#include "support/docstring.h"
 
 #include <boost/assert.hpp>
 
 #if defined (_WIN32)
-# include "gettext.h"
+# include "support/gettext.h"
 # include <windows.h>
 # include <lmcons.h>
 #else
@@ -29,7 +30,7 @@
 # include <sys/types.h>
 #endif
 
-using std::string;
+using namespace std;
 
 namespace lyx {
 namespace support {
@@ -44,7 +45,7 @@ docstring const user_name()
                return _("Unknown user");
        return from_local8bit(name);
 #else
-       struct passwd * pw(getpwuid(geteuid()));
+       struct passwd * pw = getpwuid(geteuid());
        BOOST_ASSERT(pw);
 
        string name = pw->pw_gecos;