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

fix SunCC errors/warnings and configure-variable-usage (LIBS/LDFLAGS)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1255 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Michael Gernoth 2006-09-17 11:42:22 +00:00
parent 07b5b9e41c
commit 99afd6a9f1
9 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -144,7 +144,7 @@ AC_ARG_WITH(libao,
[
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="$LIBS -L$withval/lib"
LDFLAGS="$LDFLAGS -L$withval/lib"
rpath="$rpath:$withval/lib"
]
)
@ -160,7 +160,7 @@ if test "$sound" = yes; then
[
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_libao.o"
LDFLAGS="$LDFLAGS -lao"
LIBS="$LIBS -lao"
AC_DEFINE(RDPSND_LIBAO)
])
AC_CHECK_HEADER(sys/soundcard.h,
@ -173,7 +173,7 @@ if test "$sound" = yes; then
[
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_sgi.o"
LDFLAGS="$LDFLAGS -laudio"
LIBS="$LIBS -laudio"
AC_DEFINE(RDPSND_SGI)
])
AC_CHECK_HEADER(sys/audioio.h,
@ -186,7 +186,7 @@ if test "$sound" = yes; then
[
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_alsa.o"
LDFLAGS="$LDFLAGS -lasound"
LIBS="$LIBS -lasound"
AC_DEFINE(RDPSND_ALSA)
])
fi

2
proto.h
View File

@ -167,7 +167,7 @@ void rdpsnd_send_completion(uint16 tick, uint8 packet_index);
BOOL rdpsnd_init(void);
BOOL rdpsnd_select_driver(char *driver, char *options);
void rdpsnd_show_help(void);
inline void rdpsnd_play(void);
void rdpsnd_play(void);
/* secure.c */
void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
void sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2);

6
rdpsnd.c
View File

@ -38,14 +38,14 @@ int g_dsp_fd;
static VCHANNEL *rdpsnd_channel;
static struct audio_driver *drivers = NULL;
static struct audio_driver *current_driver = NULL;
struct audio_driver *current_driver = NULL;
static BOOL device_open;
static WAVEFORMATEX formats[MAX_FORMATS];
static unsigned int format_count;
static unsigned int current_format;
static unsigned int queue_hi, queue_lo;
static struct audio_packet packet_queue[MAX_QUEUE];
unsigned int queue_hi, queue_lo;
struct audio_packet packet_queue[MAX_QUEUE];
void (*wave_out_play) (void);

10
rdpsnd.h
View File

@ -43,11 +43,11 @@ extern BOOL g_dsp_busy;
extern int g_dsp_fd;
void rdpsnd_queue_write(STREAM s, uint16 tick, uint8 index);
inline struct audio_packet *rdpsnd_queue_current_packet(void);
inline BOOL rdpsnd_queue_empty(void);
inline void rdpsnd_queue_init(void);
inline void rdpsnd_queue_next(void);
inline int rdpsnd_queue_next_tick(void);
struct audio_packet *rdpsnd_queue_current_packet(void);
BOOL rdpsnd_queue_empty(void);
void rdpsnd_queue_init(void);
void rdpsnd_queue_next(void);
int rdpsnd_queue_next_tick(void);
/* Driver register functions */
struct audio_driver *alsa_register(char *options);

26
rdpsnd_alsa.c
View File

@ -283,22 +283,22 @@ alsa_play(void)
return;
}
static struct audio_driver alsa_driver = {
wave_out_write:rdpsnd_queue_write,
wave_out_open:alsa_open,
wave_out_close:alsa_close,
wave_out_format_supported:alsa_format_supported,
wave_out_set_format:alsa_set_format,
wave_out_volume:alsa_volume,
wave_out_play:alsa_play,
name:"alsa",
description:"ALSA output driver, default device: " DEFAULTDEVICE,
next:NULL,
};
struct audio_driver *
alsa_register(char *options)
{
static struct audio_driver alsa_driver;
alsa_driver.wave_out_write = rdpsnd_queue_write;
alsa_driver.wave_out_open = alsa_open;
alsa_driver.wave_out_close = alsa_close;
alsa_driver.wave_out_format_supported = alsa_format_supported;
alsa_driver.wave_out_set_format = alsa_set_format;
alsa_driver.wave_out_volume = alsa_volume;
alsa_driver.wave_out_play = alsa_play;
alsa_driver.name = xstrdup("alsa");
alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE);
alsa_driver.next = NULL;
if (options)
{
pcm_name = xstrdup(options);

26
rdpsnd_libao.c
View File

@ -234,22 +234,22 @@ libao_play(void)
return;
}
static struct audio_driver libao_driver = {
wave_out_write:rdpsnd_queue_write,
wave_out_open:libao_open,
wave_out_close:libao_close,
wave_out_format_supported:libao_format_supported,
wave_out_set_format:libao_set_format,
wave_out_volume:libao_volume,
wave_out_play:libao_play,
name:"libao",
description:"libao output driver",
next:NULL,
};
struct audio_driver *
libao_register(char *options)
{
static struct audio_driver libao_driver;
libao_driver.wave_out_write = rdpsnd_queue_write;
libao_driver.wave_out_open = libao_open;
libao_driver.wave_out_close = libao_close;
libao_driver.wave_out_format_supported = libao_format_supported;
libao_driver.wave_out_set_format = libao_set_format;
libao_driver.wave_out_volume = libao_volume;
libao_driver.wave_out_play = libao_play;
libao_driver.name = xstrdup("libao");
libao_driver.description = xstrdup("libao output driver");
libao_driver.next = NULL;
if (options)
{
libao_device = xstrdup(options);

27
rdpsnd_oss.c
View File

@ -252,22 +252,23 @@ oss_play(void)
return;
}
static struct audio_driver oss_driver = {
wave_out_write:rdpsnd_queue_write,
wave_out_open:oss_open,
wave_out_close:oss_close,
wave_out_format_supported:oss_format_supported,
wave_out_set_format:oss_set_format,
wave_out_volume:oss_volume,
wave_out_play:oss_play,
name:"oss",
description:"OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV",
next:NULL,
};
struct audio_driver *
oss_register(char *options)
{
static struct audio_driver oss_driver;
oss_driver.wave_out_write = rdpsnd_queue_write;
oss_driver.wave_out_open = oss_open;
oss_driver.wave_out_close = oss_close;
oss_driver.wave_out_format_supported = oss_format_supported;
oss_driver.wave_out_set_format = oss_set_format;
oss_driver.wave_out_volume = oss_volume;
oss_driver.wave_out_play = oss_play;
oss_driver.name = xstrdup("oss");
oss_driver.description =
xstrdup("OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
oss_driver.next = NULL;
if (options)
{
dsp_dev = xstrdup(options);

26
rdpsnd_sgi.c
View File

@ -308,22 +308,22 @@ sgi_play(void)
}
}
static struct audio_driver sgi_driver = {
wave_out_write:rdpsnd_queue_write,
wave_out_open:sgi_open,
wave_out_close:sgi_close,
wave_out_format_supported:sgi_format_supported,
wave_out_set_format:sgi_set_format,
wave_out_volume:sgi_volume,
wave_out_play:sgi_play,
name:"sgi",
description:"SGI output driver",
next:NULL,
};
struct audio_driver *
sgi_register(char *options)
{
static struct audio_driver sgi_driver;
sgi_driver.wave_out_write = rdpsnd_queue_write;
sgi_driver.wave_out_open = sgi_open;
sgi_driver.wave_out_close = sgi_close;
sgi_driver.wave_out_format_supported = sgi_format_supported;
sgi_driver.wave_out_set_format = sgi_set_format;
sgi_driver.wave_out_volume = sgi_volume;
sgi_driver.wave_out_play = sgi_play;
sgi_driver.name = xstrdup("sgi");
sgi_driver.description = xstrdup("SGI output driver");
sgi_driver.next = NULL;
if (options)
{
sgi_output_device = xstrdup(options);

27
rdpsnd_sun.c
View File

@ -272,22 +272,23 @@ sun_play(void)
}
}
static struct audio_driver sun_driver = {
wave_out_write:rdpsnd_queue_write,
wave_out_open:sun_open,
wave_out_close:sun_close,
wave_out_format_supported:sun_format_supported,
wave_out_set_format:sun_set_format,
wave_out_volume:sun_volume,
wave_out_play:sun_play,
name:"sun",
description:"SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV",
next:NULL,
};
struct audio_driver *
sun_register(char *options)
{
static struct audio_driver sun_driver;
sun_driver.wave_out_write = rdpsnd_queue_write;
sun_driver.wave_out_open = sun_open;
sun_driver.wave_out_close = sun_close;
sun_driver.wave_out_format_supported = sun_format_supported;
sun_driver.wave_out_set_format = sun_set_format;
sun_driver.wave_out_volume = sun_volume;
sun_driver.wave_out_play = sun_play;
sun_driver.name = xstrdup("sun");
sun_driver.description =
xstrdup("SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
sun_driver.next = NULL;
if (options)
{
dsp_dev = xstrdup(options);