diff options
| author | Marcelo Boveto Shima <marceloshima@gmail.com> | 2015-02-09 11:53:47 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-09 11:54:09 +0100 |
| commit | b3496d0a7a76cb0808bbe0f7c84355e4e88878d0 (patch) | |
| tree | 91a9ce5912cc48c1e3b0762c3b0cfd44cc646ac9 | |
| parent | 3b4a915984b3136f6fddb0cdfdec01cf64715c46 (diff) | |
| download | nx-libs-b3496d0a7a76cb0808bbe0f7c84355e4e88878d0.tar.gz nx-libs-b3496d0a7a76cb0808bbe0f7c84355e4e88878d0.tar.bz2 nx-libs-b3496d0a7a76cb0808bbe0f7c84355e4e88878d0.zip | |
gcc43 fix (003_nxcompshad_gcc43.full.patch)
Use builtin includes to build with gcc43.
| -rw-r--r-- | debian/patches/003_nxcompshad_gcc43.full.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | nxcompshad/Logger.h | 4 | ||||
| -rw-r--r-- | nxcompshad/Misc.h | 4 |
4 files changed, 4 insertions, 38 deletions
diff --git a/debian/patches/003_nxcompshad_gcc43.full.patch b/debian/patches/003_nxcompshad_gcc43.full.patch deleted file mode 100644 index 165c30035..000000000 --- a/debian/patches/003_nxcompshad_gcc43.full.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: gcc43 fix - Use builtin includes to build with gcc43. - . - Originally contributed by Marcelo Boveto Shima <marceloshima@gmail.com>. -Forwarded: pending... -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Last-Update: 2011-12-31 ---- 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. ---- 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; - diff --git a/debian/patches/series b/debian/patches/series index e410e2024..3dfca5e33 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -003_nxcompshad_gcc43.full.patch 004_nx-X11_fix-nxcompshad-build.full.patch 005_nxcomp_gcc43.full+lite.patch 006_nxcomp_libpng15.full+lite.patch diff --git a/nxcompshad/Logger.h b/nxcompshad/Logger.h index 94e4da857..2e6430b48 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 6dc86359f..27f267036 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; |