tags 461695 + patch
thanks
Hi,
Attached is the diff for my zhcon 1:0.2.6-5.1 NMU.
Cheers,
Moritz
diff -u zhcon-0.2.6/src/zhcon.cpp zhcon-0.2.6/src/zhcon.cpp
--- zhcon-0.2.6/src/zhcon.cpp
+++ zhcon-0.2.6/src/zhcon.cpp
@@ -83,6 +83,8 @@
ofstream debug("debug");
#endif
+#include <cstring>
+
Zhcon* Zhcon::mpZhcon = NULL;
int Zhcon::mTtyPid = 0;
Zhcon::STATE Zhcon::mState = STOP;
diff -u zhcon-0.2.6/debian/changelog zhcon-0.2.6/debian/changelog
--- zhcon-0.2.6/debian/changelog
+++ zhcon-0.2.6/debian/changelog
@@ -1,3 +1,10 @@
+zhcon (1:0.2.6-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix GCC 4.3 compatibility, patch by Cyril Brulebois (Closes: #461695)
+
+ -- Moritz Muehlenhoff <[EMAIL PROTECTED]> Thu, 20 Mar 2008 01:16:26 +0100
+
zhcon (1:0.2.6-5) unstable; urgency=low
* Fixed FTBFS with GCC 4.3. (Closes:Bug#421056)
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/basefont.cpp
+++ zhcon-0.2.6/src/basefont.cpp
@@ -29,6 +29,8 @@
#include "hzdecoder.h"
#include "basefont.h"
+#include <cstring>
+
BaseFont::BaseFont(string & fn, int w, int h)
:mFd(0)
,mpBuf(0)
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/graphdev.cpp
+++ zhcon-0.2.6/src/graphdev.cpp
@@ -36,6 +36,8 @@
#endif
#endif
+#include <cstring>
+
using namespace std;
// mmap framebuffer address
GraphDev *GraphDev::mpGraphDev = NULL;
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/window.cpp
+++ zhcon-0.2.6/src/window.cpp
@@ -24,6 +24,8 @@
#include "debug.h"
#include "window.h"
+#include <cstring>
+
//static members for all the windows
Window* Window::mpConsole = NULL;
char* Window::mpOverlaps = NULL;
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/display/fblinear4.cpp
+++ zhcon-0.2.6/src/display/fblinear4.cpp
@@ -22,6 +22,8 @@
#include "global.h"
#include "fblinear4.h"
+#include <cstring>
+
__u16 FBLinear4::nibbletab_cfb4[] = {
#if BYTE_ORDER == LITTLE_ENDIAN
0x0000,0xf000,0x0f00,0xff00,
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/display/fblinear8.cpp
+++ zhcon-0.2.6/src/display/fblinear8.cpp
@@ -22,6 +22,8 @@
#include "global.h"
#include "fblinear8.h"
+#include <cstring>
+
__u32 FBLinear8::nibbletab_cfb8[] = {
#if BYTE_ORDER == LITTLE_ENDIAN
0x00000000,0xff000000,0x00ff0000,0xffff0000,
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp
+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp
@@ -38,6 +38,8 @@
}
#endif
+#include <cstring>
+
/* based on kernel
* Force strict CPU ordering.
* And yes, this is required on UP too when we're talking
only in patch2:
unchanged:
--- zhcon-0.2.6.orig/src/display/vgadev.cpp
+++ zhcon-0.2.6/src/display/vgadev.cpp
@@ -37,6 +37,8 @@
#include "vgadev.h"
#include "lrmi.h"
+#include <cstring>
+
#define GRAPH_BASE 0xA0000
#define GRAPH_ADDR 0x3ce
#define GRAPH_DATA 0x3cf
