This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 48c82810715011513dc38dc1fd39d67134d899c5 Author: Marcelo Boveto Shima <marceloshima@gmail.com> Date: Mon Feb 9 11:57:55 2015 +0100 Description: gcc43 fix (005_nxcomp_gcc43.full+lite.patch) Use builtin includes to build with gcc43. --- debian/patches/005_nxcomp_gcc43.full+lite.patch | 77 ----------------------- debian/patches/series | 1 - nxcomp/Message.cpp | 4 +- nxcomp/Misc.cpp | 8 +-- nxcomp/Misc.h | 4 +- nxcomp/Proxy.cpp | 4 +- nxcomp/Split.cpp | 2 +- 7 files changed, 11 insertions(+), 89 deletions(-) diff --git a/debian/patches/005_nxcomp_gcc43.full+lite.patch b/debian/patches/005_nxcomp_gcc43.full+lite.patch deleted file mode 100644 index bb758c2..0000000 --- a/debian/patches/005_nxcomp_gcc43.full+lite.patch +++ /dev/null @@ -1,77 +0,0 @@ -Description: gcc43 fix - Use builtin includes to build with gcc43. - . - Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>. -Forwarded: not-yet -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- a/nxcomp/Message.cpp 2012-03-01 03:46:39.220943822 +0100 -+++ b/nxcomp/Message.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -15,9 +15,9 @@ - /* */ - /**************************************************************************/ - --#include <stdio.h> -+#include <cstdio> - #include <unistd.h> --#include <string.h> -+#include <cstring> - - #include <algorithm> - ---- a/nxcomp/Misc.cpp 2012-03-01 03:46:39.220943822 +0100 -+++ b/nxcomp/Misc.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -15,11 +15,11 @@ - /* */ - /**************************************************************************/ - --#include <stdio.h> --#include <ctype.h> --#include <stdlib.h> -+#include <cstdio> -+#include <cctype> -+#include <cstdlib> - #include <unistd.h> --#include <signal.h> -+#include <csignal> - - #include <errno.h> - #include <string.h> ---- a/nxcomp/Misc.h 2012-03-01 03:46:39.220943822 +0100 -+++ b/nxcomp/Misc.h 2012-03-01 03:47:27.605712530 +0100 -@@ -21,8 +21,8 @@ - #include <iostream> - #include <fstream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> - - #ifdef __sun - ---- a/nxcomp/Proxy.cpp 2012-03-01 03:46:39.224943897 +0100 -+++ b/nxcomp/Proxy.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -15,9 +15,9 @@ - /* */ - /**************************************************************************/ - --#include <stdio.h> -+#include <cstdio> - #include <unistd.h> --#include <stdlib.h> -+#include <cstdlib> - #include <sys/types.h> - #include <sys/stat.h> - ---- a/nxcomp/Split.cpp 2012-03-01 03:46:39.224943897 +0100 -+++ b/nxcomp/Split.cpp 2012-03-01 03:47:27.605712530 +0100 -@@ -16,7 +16,7 @@ - /**************************************************************************/ - - #include <unistd.h> --#include <string.h> -+#include <cstring> - #include <sys/stat.h> - #include <sys/types.h> - #include <utime.h> diff --git a/debian/patches/series b/debian/patches/series index fef5467..9779715 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch 007_nxcompshad_clean-gch-files.full.patch 008_nxcomp_sa-restorer.full+lite.patch diff --git a/nxcomp/Message.cpp b/nxcomp/Message.cpp index 72d4fff..188ed9a 100644 --- a/nxcomp/Message.cpp +++ b/nxcomp/Message.cpp @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <unistd.h> -#include <string.h> +#include <cstring> #include <algorithm> diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp index 2c72259..7303c59 100644 --- a/nxcomp/Misc.cpp +++ b/nxcomp/Misc.cpp @@ -15,11 +15,11 @@ /* */ /**************************************************************************/ -#include <stdio.h> -#include <ctype.h> -#include <stdlib.h> +#include <cstdio> +#include <cctype> +#include <cstdlib> #include <unistd.h> -#include <signal.h> +#include <csignal> #include <errno.h> #include <string.h> diff --git a/nxcomp/Misc.h b/nxcomp/Misc.h index 2008317..3f37836 100644 --- a/nxcomp/Misc.h +++ b/nxcomp/Misc.h @@ -21,8 +21,8 @@ #include <iostream> #include <fstream> -#include <errno.h> -#include <string.h> +#include <cerrno> +#include <cstring> #ifdef __sun diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp index 3b4df7e..d6c67e0 100644 --- a/nxcomp/Proxy.cpp +++ b/nxcomp/Proxy.cpp @@ -15,9 +15,9 @@ /* */ /**************************************************************************/ -#include <stdio.h> +#include <cstdio> #include <unistd.h> -#include <stdlib.h> +#include <cstdlib> #include <sys/types.h> #include <sys/stat.h> diff --git a/nxcomp/Split.cpp b/nxcomp/Split.cpp index 50627e7..35a4ed4 100644 --- a/nxcomp/Split.cpp +++ b/nxcomp/Split.cpp @@ -16,7 +16,7 @@ /**************************************************************************/ #include <unistd.h> -#include <string.h> +#include <cstring> #include <sys/stat.h> #include <sys/types.h> #include <utime.h> -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git