From: darco <darco@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Wed, 9 Nov 2005 08:33:36 +0000 (+0000)
Subject: argh
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=5b563cca093fe09eb397bbbf336412d9fa6fb4bd;p=synfig.git

argh


git-svn-id: http://svn.voria.com/code@46 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/config/configure.ac b/synfig-studio/trunk/config/configure.ac
index 1193af3..3747217 100755
--- a/synfig-studio/trunk/config/configure.ac
+++ b/synfig-studio/trunk/config/configure.ac
@@ -102,7 +102,7 @@ if test $with_libfmod = "yes" ; then {
 # -- H E A D E R S --------------------------------------------
 
 AC_CHECK_HEADERS([unistd.h signal.h fcntl.h])
-AC_CHECK_HEADERS([sys/types.h sys/wait.h sys/stat.h sys/time.h sys/resource.h])
+AC_CHECK_HEADERS([sys/types.h sys/wait.h sys/stat.h sys/time.h sys/resource.h sys/errno.h])
 
 # -- T Y P E S & S T R U C T S --------------------------------
 
diff --git a/synfig-studio/trunk/src/gtkmm/ipc.cpp b/synfig-studio/trunk/src/gtkmm/ipc.cpp
index 3de0d6a..d6e14aa 100644
--- a/synfig-studio/trunk/src/gtkmm/ipc.cpp
+++ b/synfig-studio/trunk/src/gtkmm/ipc.cpp
@@ -39,6 +39,10 @@
 #include <sys/stat.h>
 #endif
 
+#ifdef HAVE_SYS_ERRNO_H
+#include <sys/errno.h>
+#endif
+
 #include <synfig/main.h>
 #include "app.h"
 
@@ -179,7 +183,7 @@ IPC::IPC()
 
 		if(fd<0)
 		{
-			synfig::error("IPC(): Failed to open fifo \"%s\". (errno=%d)",fifo_path().c_str(),errno);
+			synfig::error("IPC(): Failed to open fifo \"%s\". (errno=%d)",fifo_path().c_str(),::errno);
 		}
 		else
 		{
diff --git a/synfig-studio/trunk/src/synfigapp/cvs.cpp b/synfig-studio/trunk/src/synfigapp/cvs.cpp
index 0ebb525..a864c50 100644
--- a/synfig-studio/trunk/src/synfigapp/cvs.cpp
+++ b/synfig-studio/trunk/src/synfigapp/cvs.cpp
@@ -238,7 +238,10 @@ CVSInfo::get_current_timestamp()const
 		synfig::error("Unable to get file stats");
 		return false;
 	}
-	return st.st_mtime+timezone+(daylight-1)*3600;
+	time_t ret((daylight-1)*3600);
+	//ret+=timezone;
+	ret+=st.st_mtime;
+	return ret;
 }
 
 synfig::String