kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile warnings on HP-UX.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@535 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Matt Chapman 2003-10-31 04:29:57 +00:00
parent b0a0427c35
commit 826ceb5d4a
8 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels.c
View File

@ -81,7 +81,7 @@ channel_send(STREAM s, VCHANNEL * channel)
{ {
uint32 length, flags; uint32 length, flags;
uint32 thislength, remaining; uint32 thislength, remaining;
char *data; uint8 *data;
/* first fragment sent in-place */ /* first fragment sent in-place */
s_pop_layer(s, channel_hdr); s_pop_layer(s, channel_hdr);

2
cliprdr.c
View File

@ -96,7 +96,7 @@ cliprdr_process(STREAM s)
{ {
uint16 type, status; uint16 type, status;
uint32 length, format; uint32 length, format;
char *data; uint8 *data;
in_uint16_le(s, type); in_uint16_le(s, type);
in_uint16_le(s, status); in_uint16_le(s, status);

3
configure vendored
View File

@ -288,6 +288,9 @@ case `uname -s` in
OSF1) OSF1)
ldflags="$ldflags -Wl,-rpath,$rpath" ldflags="$ldflags -Wl,-rpath,$rpath"
;; ;;
HP-UX)
cflags="$cflags -D_XOPEN_SOURCE_EXTENDED"
;;
esac esac

4
proto.h
View File

@ -118,8 +118,8 @@ STREAM tcp_recv(STREAM s, uint32 length);
BOOL tcp_connect(char *server); BOOL tcp_connect(char *server);
void tcp_disconnect(void); void tcp_disconnect(void);
/* xclip.c */ /* xclip.c */
void ui_clip_format_announce(char *data, uint32 length); void ui_clip_format_announce(uint8 *data, uint32 length);
void ui_clip_handle_data(char *data, uint32 length); void ui_clip_handle_data(uint8 *data, uint32 length);
void ui_clip_request_data(uint32 format); void ui_clip_request_data(uint32 format);
void ui_clip_sync(void); void ui_clip_sync(void);
void xclip_init(void); void xclip_init(void);

5
rdesktop.h
View File

@ -49,7 +49,12 @@
#endif #endif
#define STRNCPY(dst,src,n) { strncpy(dst,src,n-1); dst[n-1] = 0; } #define STRNCPY(dst,src,n) { strncpy(dst,src,n-1); dst[n-1] = 0; }
#ifndef MIN
#define MIN(x,y) (((x) < (y)) ? (x) : (y)) #define MIN(x,y) (((x) < (y)) ? (x) : (y))
#endif
#ifndef MAX
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
#endif
#include "parse.h" #include "parse.h"
#include "constants.h" #include "constants.h"

2
rdpdr.c
View File

@ -209,7 +209,7 @@ static void
rdpdr_process(STREAM s) rdpdr_process(STREAM s)
{ {
uint32 handle; uint32 handle;
char *magic; uint8 *magic;
printf("rdpdr_process\n"); printf("rdpdr_process\n");
hexdump(s->p, s->end - s->p); hexdump(s->p, s->end - s->p);

4
xclip.c
View File

@ -217,7 +217,7 @@ xclip_handle_PropertyNotify(XPropertyEvent * event)
void void
ui_clip_format_announce(char *data, uint32 length) ui_clip_format_announce(uint8 *data, uint32 length)
{ {
XSetSelectionOwner(g_display, primary_atom, g_wnd, g_last_gesturetime); XSetSelectionOwner(g_display, primary_atom, g_wnd, g_last_gesturetime);
if (XGetSelectionOwner(g_display, primary_atom) != g_wnd) if (XGetSelectionOwner(g_display, primary_atom) != g_wnd)
@ -238,7 +238,7 @@ ui_clip_format_announce(char *data, uint32 length)
void void
ui_clip_handle_data(char *data, uint32 length) ui_clip_handle_data(uint8 *data, uint32 length)
{ {
xclip_provide_selection(&selection_request, XA_STRING, 8, data, length - 1); xclip_provide_selection(&selection_request, XA_STRING, 8, data, length - 1);
} }

7
xwin.c
View File

@ -849,12 +849,11 @@ ui_deinit(void)
g_display = NULL; g_display = NULL;
} }
#define NULL_POINTER_MASK "\x80"
#define NULL_POINTER_DATA "\x0\x0\x0"
BOOL BOOL
ui_create_window(void) ui_create_window(void)
{ {
uint8 null_pointer_mask[1] = { 0x80 };
uint8 null_pointer_data[4] = { 0x00, 0x00, 0x00, 0x00 };
XSetWindowAttributes attribs; XSetWindowAttributes attribs;
XClassHint *classhints; XClassHint *classhints;
XSizeHints *sizehints; XSizeHints *sizehints;
@ -937,7 +936,7 @@ ui_create_window(void)
XSetWMProtocols(g_display, g_wnd, &g_kill_atom, 1); XSetWMProtocols(g_display, g_wnd, &g_kill_atom, 1);
/* create invisible 1x1 cursor to be used as null cursor */ /* create invisible 1x1 cursor to be used as null cursor */
g_null_cursor = ui_create_cursor(0, 0, 1, 1, NULL_POINTER_MASK, NULL_POINTER_DATA); g_null_cursor = ui_create_cursor(0, 0, 1, 1, null_pointer_mask, null_pointer_data);
return True; return True;
} }