fixes for HP-UX

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@602 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Michael Gernoth 2004-02-07 18:47:06 +00:00
parent 6a1b00fcb9
commit 7deb3bbc62
6 changed files with 9 additions and 8 deletions

2
configure vendored
View File

@ -270,7 +270,7 @@ elif [ -f /usr/include/sys/audioio.h ]; then
echo "SOUNDOBJ = rdpsnd.o rdpsnd_sun.o" >>Makeconf
cflags="$cflags -DWITH_RDPSND"
else
echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audioio.h)"
echo "Currently supported systems are Open Sound System and Sun"
echo
fi

4
disk.c
View File

@ -84,7 +84,7 @@
#define SOLARIS
#endif
#ifdef SOLARIS
#if (defined(SOLARIS) || defined(__hpux))
#define DIRFD(a) ((a)->dd_fd)
#else
#define DIRFD(a) (dirfd(a))
@ -102,7 +102,7 @@
#include <time.h> /* ctime */
#if defined(SOLARIS)
#if (defined(SOLARIS) || defined (__hpux) || defined(__BEOS__))
#include <sys/statvfs.h> /* solaris statvfs */
#define STATFS_FN(path, buf) (statvfs(path,buf))
#define STATFS_T statvfs

View File

@ -44,7 +44,7 @@ printer_enum_devices(uint32 *id, char *optarg)
pprinter_data = (PRINTER *) xmalloc(sizeof(PRINTER));
strcpy(g_rdpdr_device[*id].name, "PRN");
strcat(g_rdpdr_device[*id].name, ltoa(already + count + 1, 10));
strcat(g_rdpdr_device[*id].name, l_to_a(already + count + 1, 10));
/* first printer is set as default printer */
if ((already + count) == 0)

View File

@ -70,7 +70,7 @@ void warning(char *format, ...);
void unimpl(char *format, ...);
void hexdump(unsigned char *p, unsigned int len);
void toupper_str(char *p);
char *ltoa(long N, int base);
char *l_to_a(long N, int base);
int load_licence(unsigned char **data);
void save_licence(unsigned char *data, int length);
char *next_arg(char *src, char needle);

View File

@ -812,7 +812,7 @@ toupper_str(char *p)
#define LTOA_BUFSIZE (sizeof(long) * 8 + 1)
char *
ltoa(long N, int base)
l_to_a(long N, int base)
{
static char ret[LTOA_BUFSIZE];

5
xwin.c
View File

@ -23,6 +23,7 @@
#include <unistd.h>
#include <time.h>
#include <errno.h>
#include <strings.h>
#include "rdesktop.h"
#include "xproto.h"
@ -63,7 +64,7 @@ static int g_red_shift_l, g_blue_shift_l, g_green_shift_l;
/* software backing store */
static BOOL g_ownbackstore;
static Pixmap g_backstore = NULL;
static Pixmap g_backstore = 0;
/* Moving in single app mode */
static BOOL g_moving_wnd;
@ -894,7 +895,7 @@ ui_create_window(void)
if (g_gc == NULL)
g_gc = XCreateGC(g_display, g_wnd, 0, NULL);
if ((g_ownbackstore) && (g_backstore == NULL))
if ((g_ownbackstore) && (g_backstore == 0))
{
g_backstore = XCreatePixmap(g_display, g_wnd, g_width, g_height, g_depth);