Apple-2-Tools/gsport
1
0
Fork 0
mirror of https://github.com/david-schmidt/gsport.git synced 2024-06-09 18:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Update generic Unix build - compile with g++ to pick up printer additions, which also resulted in a number of casting changes.

Browse Source
This commit is contained in:
David Schmidt 2012-02-24 22:23:00 +00:00
parent 1ea60eab96
commit dd47539e6b
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scc_socket_driver.c
View File

@ -358,7 +358,7 @@ scc_accept_socket(int port, double dcycs)
}
if(scc_ptr->rdwrfd == -1) {
rdwrfd = accept(scc_ptr->sockfd, (struct sockaddr*)scc_ptr->host_handle,
&(scc_ptr->host_aux1));
(socklen_t*)&(scc_ptr->host_aux1));
if(rdwrfd < 0) {
return;
}

2
src/sound.c
View File

@ -298,7 +298,7 @@ sound_init_general()
exit(2);
}
shmaddr = shmat(shmid, 0, 0);
shmaddr = (word32*)shmat(shmid, 0, 0);
tmp = (int)PTR2WORD(shmaddr);
if(tmp == -1) {
printf("sound_init: shmat ret: %p, errno: %d\n", shmaddr,

4
src/vars_x86linux
View File

@ -1,9 +1,9 @@
TARGET = gsportx
OBJECTS = $(OBJECTS1) xdriver.o
CC = cc
CC = g++
CCOPTS = -O2 -Wall -fomit-frame-pointer -march=pentium
OPTS = -DGSPORT_LITTLE_ENDIAN
OPTS = -DGSPORT_LITTLE_ENDIAN
SUFFIX =
NAME = gsportx
LDFLAGS =

11
src/xdriver.c
View File

@ -38,7 +38,6 @@
#endif
int XShmQueryExtension(Display *display);
void _XInitImageFuncPtrs(XImage *xim);
#include "defc.h"
#include "protos_xdriver.h"
@ -675,7 +674,7 @@ x_try_find_visual(int depth, int screen_num, XVisualInfo **visual_list_ptr)
(word32)visualList[i].visualid,
visualList[i].screen,
visualList[i].depth,
visualList[i].class);
visualList[i].c_class);
printf(" red: %08lx, green: %08lx, blue: %08lx\n",
visualList[i].red_mask,
visualList[i].green_mask,
@ -683,8 +682,8 @@ x_try_find_visual(int depth, int screen_num, XVisualInfo **visual_list_ptr)
printf(" cmap size: %d, bits_per_rgb: %d\n",
visualList[i].colormap_size,
visualList[i].bits_per_rgb);
match8 = (visualList[i].class == PseudoColor);
match24 = (visualList[i].class == TrueColor);
match8 = (visualList[i].c_class == PseudoColor);
match24 = (visualList[i].c_class == TrueColor);
if((depth == 8) && match8) {
visual_chosen = i;
Max_color_size = visualList[i].colormap_size;
@ -901,7 +900,7 @@ get_ximage(Kimage *kimage_ptr)
#else
xim->byte_order = MSBFirst;
#endif
_XInitImageFuncPtrs(xim); /* adjust to new byte order */
XInitImage(xim); /* adjust to new byte order */
/* check mdepth! */
if(xim->bits_per_pixel != mdepth) {
@ -1093,7 +1092,7 @@ check_input_events()
(word32)(ev.xcolormap.window));
vid_printf("colormap: %08x, new: %d, state: %d\n",
(word32)ev.xcolormap.colormap,
ev.xcolormap.new, ev.xcolormap.state);
ev.xcolormap.c_new, ev.xcolormap.state);
break;
default:
printf("X event 0x%08x is unknown!\n",