Attachment #151369 for bug #219769

View | Details | Raw Unified | Return to bug 219769
Collapse All | Expand All

Lines 27-36 Link Here

(-)zhcon-0.2.6.orig/src/basefont.cpp (+2 lines)
27	#include "global.h"	27	#include "global.h"
28	#include "debug.h"	28	#include "debug.h"
29	#include "hzdecoder.h"	29	#include "hzdecoder.h"
30	#include "basefont.h"	30	#include "basefont.h"
31		31
		32	#include <cstring>
		33
32	BaseFont::BaseFont(string & fn, int w, int h)	34	BaseFont::BaseFont(string & fn, int w, int h)
33	:mFd(0)	35	:mFd(0)
34	,mpBuf(0)	36	,mpBuf(0)
35	,mWidth(w)	37	,mWidth(w)
36	,mHeight(h) {	38	,mHeight(h) {

Lines 20-29 Link Here

(-)zhcon-0.2.6.orig/src/display/fblinear4.cpp (+2 lines)
20	#include <assert.h>	20	#include <assert.h>
21	#include <endian.h>	21	#include <endian.h>
22	#include "global.h"	22	#include "global.h"
23	#include "fblinear4.h"	23	#include "fblinear4.h"
24		24
		25	#include <cstring>
		26
25	__u16 FBLinear4::nibbletab_cfb4[] = {	27	__u16 FBLinear4::nibbletab_cfb4[] = {
26	#if BYTE_ORDER == LITTLE_ENDIAN	28	#if BYTE_ORDER == LITTLE_ENDIAN
27	0x0000,0xf000,0x0f00,0xff00,	29	0x0000,0xf000,0x0f00,0xff00,
28	0x00f0,0xf0f0,0x0ff0,0xfff0,	30	0x00f0,0xf0f0,0x0ff0,0xfff0,
29	0x000f,0xf00f,0x0f0f,0xff0f,	31	0x000f,0xf00f,0x0f0f,0xff0f,

Lines 20-29 Link Here

(-)zhcon-0.2.6.orig/src/display/fblinear8.cpp (+2 lines)
20	#include <assert.h>	20	#include <assert.h>
21	#include <endian.h>	21	#include <endian.h>
22	#include "global.h"	22	#include "global.h"
23	#include "fblinear8.h"	23	#include "fblinear8.h"
24		24
		25	#include <cstring>
		26
25	__u32 FBLinear8::nibbletab_cfb8[] = {	27	__u32 FBLinear8::nibbletab_cfb8[] = {
26	#if BYTE_ORDER == LITTLE_ENDIAN	28	#if BYTE_ORDER == LITTLE_ENDIAN
27	0x00000000,0xff000000,0x00ff0000,0xffff0000,	29	0x00000000,0xff000000,0x00ff0000,0xffff0000,
28	0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,	30	0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
29	0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,	31	0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,

Lines 36-45 Link Here

(-)zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp (+2 lines)
36	: "a" ((char) value),	36	: "a" ((char) value),
37	"d" ((unsigned short) port));	37	"d" ((unsigned short) port));
38	}	38	}
39	#endif	39	#endif
40		40
		41	#include <cstring>
		42
41	/* based on kernel	43	/* based on kernel
42	* Force strict CPU ordering.	44	* Force strict CPU ordering.
43	* And yes, this is required on UP too when we're talking	45	* And yes, this is required on UP too when we're talking
44	* to devices.	46	* to devices.
45	*	47	*

Lines 35-44 Link Here

(-)zhcon-0.2.6.orig/src/display/vgadev.cpp (+2 lines)
35	#include <cassert>	35	#include <cassert>
36	#include "debug.h"	36	#include "debug.h"
37	#include "vgadev.h"	37	#include "vgadev.h"
38	#include "lrmi.h"	38	#include "lrmi.h"
39		39
		40	#include <cstring>
		41
40	#define GRAPH_BASE 0xA0000	42	#define GRAPH_BASE 0xA0000
41	#define GRAPH_ADDR 0x3ce	43	#define GRAPH_ADDR 0x3ce
42	#define GRAPH_DATA 0x3cf	44	#define GRAPH_DATA 0x3cf
43		45
44	char *VGADev::mpBuf = NULL;	46	char *VGADev::mpBuf = NULL;




#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
#include <assert.h>
#include <iostream>
#include <cstdlib>
#include "debug.h"

#include "display/fbdev.h"
#include "display/vgadev.h"
#if defined(linux) || defined(__FreeBSD__)
    #ifdef HAVE_GGI_LIB
    #include "display/libggi.h"
    #endif
#endif

#include <cstring>

using namespace std;
// mmap framebuffer address
GraphDev *GraphDev::mpGraphDev = NULL;

// font

Lines 14-23 Link Here

(-)zhcon-0.2.6.orig/src/inputclient.cpp (+2 lines)
14	* the Free Software Foundation; either version 2 of the License, or *	14	* the Free Software Foundation; either version 2 of the License, or *
15	* (at your option) any later version. *	15	* (at your option) any later version. *
16	* *	16	* *
17	***************************************************************************/	17	***************************************************************************/
18		18
		19	#include <cstdlib>
		20
19	#include "inputclient.h"	21	#include "inputclient.h"
20		22
21	Console* InputClient::mpCon = NULL;	23	Console* InputClient::mpCon = NULL;
22	InputClient::InputClient()	24	InputClient::InputClient()
23	: mVisible(false),	25	: mVisible(false),

Lines 22-31 Link Here

(-)zhcon-0.2.6.orig/src/inputmanager.cpp (+1 lines)
22	using namespace std;	22	using namespace std;
23		23
24	#include <unistd.h>	24	#include <unistd.h>
25	#include <sys/time.h>	25	#include <sys/time.h>
26	#include <string>	26	#include <string>
		27	#include <cstdlib>
27		28
28	#include "global.h"	29	#include "global.h"
29	#include "debug.h"	30	#include "debug.h"
30	#include "keymap.h"	31	#include "keymap.h"
31	#include "console.h"	32	#include "console.h"

Lines 24-33 Link Here

(-)zhcon-0.2.6.orig/src/inputmanager.h (+1 lines)
24	*@author ejoy	24	*@author ejoy
25	*/	25	*/
26	using namespace std;	26	using namespace std;
27	#include <cassert>	27	#include <cassert>
28	#include <vector>	28	#include <vector>
		29	#include <sys/types.h>
29		30
30	#include "mouse.h"	31	#include "mouse.h"
31	#if defined(__FreeBSD__)	32	#if defined(__FreeBSD__)
32	#include <sys/kbio.h>	33	#include <sys/kbio.h>
33	#endif	34	#endif

Lines 22-31 Link Here

(-)zhcon-0.2.6.orig/src/window.cpp (+2 lines)
22	#include <algorithm>	22	#include <algorithm>
23	#include "global.h"	23	#include "global.h"
24	#include "debug.h"	24	#include "debug.h"
25	#include "window.h"	25	#include "window.h"
26		26
		27	#include <cstring>
		28
27	//static members for all the windows	29	//static members for all the windows
28	Window* Window::mpConsole = NULL;	30	Window* Window::mpConsole = NULL;
29	char* Window::mpOverlaps = NULL;	31	char* Window::mpOverlaps = NULL;
30		32
31	Window::Window(int x1, int y1, int x2, int y2, int type)	33	Window::Window(int x1, int y1, int x2, int y2, int type)

Lines 81-90 Link Here

(-)zhcon-0.2.6.orig/src/zhcon.cpp (+2 lines)
81	#ifndef NDEBUG	81	#ifndef NDEBUG
82	#include "debug.h"	82	#include "debug.h"
83	ofstream debug("debug");	83	ofstream debug("debug");
84	#endif	84	#endif
85		85
		86	#include <cstring>
		87
86	Zhcon* Zhcon::mpZhcon = NULL;	88	Zhcon* Zhcon::mpZhcon = NULL;
87	int Zhcon::mTtyPid = 0;	89	int Zhcon::mTtyPid = 0;
88	Zhcon::STATE Zhcon::mState = STOP;	90	Zhcon::STATE Zhcon::mState = STOP;
89		91
90	void Zhcon::SignalVtLeave(int signo) {	92	void Zhcon::SignalVtLeave(int signo) {

Return to bug 219769

Lines 24-43 Link Here

(-)zhcon-0.2.6.orig/src/graphdev.cpp (+3 lines)
24	#include <fcntl.h>	24	#include <fcntl.h>
25	#include <sys/ioctl.h>	25	#include <sys/ioctl.h>
26	#include <sys/mman.h>	26	#include <sys/mman.h>
27	#include <assert.h>	27	#include <assert.h>
28	#include <iostream>	28	#include <iostream>
		29	#include <cstdlib>
29	#include "debug.h"	30	#include "debug.h"
30		31
31	#include "display/fbdev.h"	32	#include "display/fbdev.h"
32	#include "display/vgadev.h"	33	#include "display/vgadev.h"
33	#if defined(linux) \|\| defined(__FreeBSD__)	34	#if defined(linux) \|\| defined(__FreeBSD__)
34	#ifdef HAVE_GGI_LIB	35	#ifdef HAVE_GGI_LIB
35	#include "display/libggi.h"	36	#include "display/libggi.h"
36	#endif	37	#endif
37	#endif	38	#endif
38		39
		40	#include <cstring>
		41
39	using namespace std;	42	using namespace std;
40	// mmap framebuffer address	43	// mmap framebuffer address
41	GraphDev *GraphDev::mpGraphDev = NULL;	44	GraphDev *GraphDev::mpGraphDev = NULL;
42		45
43	// font	46	// font