aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/patches/005_nxcomp_gcc43.full+lite.patch77
-rw-r--r--debian/patches/series1
-rw-r--r--nxcomp/Message.cpp4
-rw-r--r--nxcomp/Misc.cpp8
-rw-r--r--nxcomp/Misc.h4
-rw-r--r--nxcomp/Proxy.cpp4
-rw-r--r--nxcomp/Split.cpp2
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 bb758c2bd..000000000
--- 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 fef54678f..9779715e4 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 72d4fff3d..188ed9a0e 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 2c72259e3..7303c595b 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 200831757..3f37836f5 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 3b4df7eb6..d6c67e0e8 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 50627e793..35a4ed4a2 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>