[X2go-Commits] nx-libs.git - test (branch) updated: 1ae97588f16046f49f11c5ec92640bb8caa633ef

[X2go dev team]

The branch, test has been updated
       via  1ae97588f16046f49f11c5ec92640bb8caa633ef (commit)
       via  1b28ea2e350e7d794c00a360798551e3959d0180 (commit)
      from  626c9b8f9f2edf56b6cb3e8c406015340e366022 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1ae97588f16046f49f11c5ec92640bb8caa633ef
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:47:24 2011 +0200

    Try workaround for nxcompshad build failure.

commit 1b28ea2e350e7d794c00a360798551e3959d0180
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 21 00:46:57 2011 +0200

    Use builtin includes.

-----------------------------------------------------------------------

Summary of changes:
 nx-X11/programs/Xserver/Imakefile |    2 +-
 nxcompshad/Logger.h               |    4 ++--
 nxcompshad/Misc.h                 |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 6bf7801..1d12173 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -1047,7 +1047,7 @@ $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
 #else
 $(NX_XSHADOWLIBTARGET): $(NX_XSHADOWCONFIGTARGET)
 	cd $(NX_XSHADOWLIBDIR) && \
-	make
+	rm -f *.o && make
 #endif
 
 ServerTarget(nxagent,$(NX_XSHADOWLIBTARGET) $(NXAGENTDIRS),$(NXAGENTOBJS), \
diff --git a/nxcompshad/Logger.h b/nxcompshad/Logger.h
index 94e4da8..2e6430b 100644
--- a/nxcompshad/Logger.h
+++ b/nxcompshad/Logger.h
@@ -18,8 +18,8 @@
 #ifndef Logger_H
 #define Logger_H
 
-#include <errno.h>
-#include <stdarg.h>
+#include <cerrno>
+#include <cstdarg>
 
 //
 // Error handling macros.
diff --git a/nxcompshad/Misc.h b/nxcompshad/Misc.h
index 6dc8635..27f2670 100644
--- a/nxcompshad/Misc.h
+++ b/nxcompshad/Misc.h
@@ -20,8 +20,8 @@
 
 #include <iostream>
 
-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>
 
 using namespace std;
 


hooks/post-receive
-- 
nx-libs.git (NX libraries)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX libraries).