[Libreoffice-commits] online.git: loolwsd/Util.cpp

[Tor Lillqvist]

 loolwsd/Util.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cdb0c08bb89e5e7d8c5237beeed0e39513d2b481
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Mar 1 15:27:36 2016 +0200

    Let's be consistent

diff --git a/loolwsd/Util.cpp b/loolwsd/Util.cpp
index 220f6c1..fab7a06 100644
--- a/loolwsd/Util.cpp
+++ b/loolwsd/Util.cpp
@@ -50,7 +50,7 @@ extern "C"
         std::vector<char> *outputp = (std::vector<char> *) png_get_io_ptr(png_ptr);
         const size_t oldsize = outputp->size();
         outputp->resize(oldsize + length);
-        memcpy(outputp->data() + oldsize, data, length);
+        std::memcpy(outputp->data() + oldsize, data, length);
     }
 
     static void user_flush_fn(png_structp)
@@ -443,7 +443,7 @@ namespace Util
                      << Util::signalName(signal) << " "
                      << strsignal(signal) << Log::end;
 
-        if (getenv("LOOL_DEBUG"))
+        if (std::getenv("LOOL_DEBUG"))
         {
             Log::error() << "\nSegfault! Attach debugger with:\n"
                          << "sudo gdb --pid=" << Poco::Process::id() << "\n or \n"