Attachment #17519 for bug #28466

Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

View | Details | Raw Unified | Return to bug 28466 | Differences between
Collapse All | Expand All

Lines 3-8 Link Here

(-)common/console.c (+8 lines)
3	#include "id_us.h"	3	#include "id_us.h"
4	#include "console.h"	4	#include "console.h"
5		5
		6	#ifdef _LINUX
		7	#include <string.h>
		8	#endif
		9
		10	#ifdef _LINUX
		11	#include <string.h>
		12	#endif
		13
6	static char con_lines[32][45]; // buffer	14	static char con_lines[32][45]; // buffer
7	static int con_active; // console is visible	15	static int con_active; // console is visible
8	static int con_current; // current line	16	static int con_current; // current line

Lines 178-183 Link Here

(-)common/id_in.h (+1 lines)
178		178
179	void IN_Startup();	179	void IN_Startup();
180	void IN_Shutdown();	180	void IN_Shutdown();
		181	void IN_KeyEvent(unsigned char key);
181	void IN_Default(wbool gotit, ControlType in);	182	void IN_Default(wbool gotit, ControlType in);
182	void IN_ClearKeysDown();	183	void IN_ClearKeysDown();
183	void IN_ReadControl(int player, ControlInfo *info);	184	void IN_ReadControl(int player, ControlInfo *info);

Lines 230-232 Link Here

(-)common/id_vh.c (+1 lines)
230		230
231	}	231	}
232	*/	232	*/
		233

Lines 1-5 Link Here

(-)common/opengl.c (+5 lines)
1	#include <stdio.h>	1	#include <stdio.h>
2	#include <stdlib.h>	2	#include <stdlib.h>
		3
		4	#ifdef _LINUX
		5	#include <string.h>
		6	#endif
		7
3	#include "system.h"	8	#include "system.h"
4	#include "opengl.h"	9	#include "opengl.h"
5	#include "wl_def.h"	10	#include "wl_def.h"

Lines 1-5 Link Here

(-)common/wl_act2.c (+4 lines)
1	// WL_ACT2.C	1	// WL_ACT2.C
2		2
		3	#ifdef _LINUX
		4	#include <stdlib.h>
		5	#endif
		6
3	#include "wl_def.h"	7	#include "wl_def.h"
4		8
5	//=============================================================================	9	//=============================================================================

Lines 3-8 Link Here

(-)common/wl_agent.c (+4 lines)
3	#include <string.h>	3	#include <string.h>
4	#include "wl_def.h"	4	#include "wl_def.h"
5		5
		6	#ifdef _LINUX
		7	#include <stdlib.h>
		8	#endif
		9
6	//=============================================================================	10	//=============================================================================
7	// LOCAL CONSTANTS	11	// LOCAL CONSTANTS
8	//=============================================================================	12	//=============================================================================

Lines 2-7 Link Here

(-)common/wl_draw.c (+5 lines)
2		2
3	#include <stdio.h>	3	#include <stdio.h>
4	#include <stdlib.h>	4	#include <stdlib.h>
		5
		6	#ifdef _LINUX
		7	#include <string.h>
		8	#endif
		9
5	#include "system.h"	10	#include "system.h"
6	#include "opengl.h"	11	#include "opengl.h"
7	#include "wl_def.h"	12	#include "wl_def.h"

Lines 5-10 Link Here

(-)common/wl_menu.c (+4 lines)
5	//	5	//
6	////////////////////////////////////////////////////////////////////	6	////////////////////////////////////////////////////////////////////
7		7
		8	#ifdef _LINUX
		9	#include "../linux/input.h"
		10	#endif
		11
8	#include <string.h>	12	#include <string.h>
9	#include "opengl.h"	13	#include "opengl.h"
10	#include "wl_def.h"	14	#include "wl_def.h"

Lines 233-235 Link Here

(-)common/wl_menu.h (+1 lines)
233	void NonShareware();	233	void NonShareware();
234	/*int GetYorN(int x,int y,int pic);	234	/*int GetYorN(int x,int y,int pic);
235	*/	235	*/
		236

Lines 1-6 Link Here

(-)common/wl_play.c (+5 lines)
1	// WL_PLAY.C	1	// WL_PLAY.C
2		2
3	#include <memory.h>	3	#include <memory.h>
		4
		5	#ifdef _LINUX
		6	#include "../linux/input.h"
		7	#endif
		8
4	#include "wl_def.h"	9	#include "wl_def.h"
5	#include "system.h"	10	#include "system.h"
6		11

Lines 2-7 Link Here

(-)common/wl_state.c (+4 lines)
2		2
3	#include "wl_def.h"	3	#include "wl_def.h"
4		4
		5	#ifdef _LINUX
		6	#include <stdlib.h>
		7	#endif
		8
5	//=============================================================================	9	//=============================================================================
6	// GLOBAL VARIABLES	10	// GLOBAL VARIABLES
7	//=============================================================================	11	//=============================================================================

Lines 4-9 Link Here

(-)common/wl_text.c (+4 lines)
4	#include "wl_def.h"	4	#include "wl_def.h"
5	#include "system.h"	5	#include "system.h"
6		6
		7	#ifdef _LINUX
		8	#include <string.h>
		9	#endif
		10
7	#ifndef SPEAR	11	#ifndef SPEAR
8		12
9	void FreeMusic(); // WL_MENU.C	13	void FreeMusic(); // WL_MENU.C

Lines 9-14 Link Here

(-)linux/sound.c (+2 lines)
9	#include <stdlib.h>	9	#include <stdlib.h>
10		10
11	#include <sys/time.h>	11	#include <sys/time.h>
		12	#include <string.h>
		13	#include <errno.h>
12		14
13	#include <fcntl.h>	15	#include <fcntl.h>
14	#include <unistd.h>	16	#include <unistd.h>

Lines 1-5 Link Here

(-)linux/sound.h (+3 lines)
1	void S_LoadSound(int id, void* data, long length);	1	void S_LoadSound(int id, void* data, long length);
2	void S_PlaySound(int id, int pan);	2	void S_PlaySound(int id, int pan);
		3	void S_UpdateSound();
		4	void S_InitSound();
		5	void S_ShutDownSound();
3		6
4	extern int DigitalDevice;	7	extern int DigitalDevice;
5		8

Lines 1-9 Link Here

(-)linux/system.c (-1 / +4 lines)
1	#include <stdio.h>	1	#include <stdio.h>
		2	#include <string.h>
		3	#include <unistd.h>
2	#include <sys/time.h>	4	#include <sys/time.h>
3	#include <X11/keysym.h>	5	#include <X11/keysym.h>
4	#include <GL/gl.h>	6	#include <GL/gl.h>
5	#include <GL/glx.h>	7	#include <GL/glx.h>
6	#include "wl_def.h"	8	#include "wl_def.h"
		9	#include "sound.h"
7		10
8	int screen_width, screen_height;	11	int screen_width, screen_height;
9	Display *dpy;	12	Display *dpy;
Lines 117-123 Link Here
117	visinfo = glXChooseVisual( dpy, scrnum, attrib );	120	visinfo = glXChooseVisual( dpy, scrnum, attrib );
118	if (!visinfo) {	121	if (!visinfo) {
119	printf("Error: couldn't get an RGB, Double-buffered visual\n");	122	printf("Error: couldn't get an RGB, Double-buffered visual\n");
120	exit(1);	123	_exit(1);
121	}	124	}
122		125
123	/* window attributes */	126	/* window attributes */

Return to bug 28466