CVS: rdesktop configure.ac, 1.23, 1.24 proto.h, 1.94, 1.95 rdpsnd.c, 1.12, 1.13 rdpsnd.h, 1.2, 1.3 rdpsnd_alsa.c, 1.3, 1.4 rdpsnd_libao.c, 1.16, 1.17 rdpsnd_oss.c, 1.22, 1.23 rdpsnd_sgi.c, 1.11, 1.12 rdpsnd_sun.c, 1.18, 1.19
Michael Gernoth <[email protected]> Sun, 17 Sep 2006 04:42:25 -0700
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18166
Modified Files:
configure.ac proto.h rdpsnd.c rdpsnd.h rdpsnd_alsa.c
rdpsnd_libao.c rdpsnd_oss.c rdpsnd_sgi.c rdpsnd_sun.c
Log Message:
fix SunCC errors/warnings and configure-variable-usage (LIBS/LDFLAGS)
Index: configure.ac
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/configure.ac,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** configure.ac 17 Sep 2006 11:04:49 -0000 1.23
--- configure.ac 17 Sep 2006 11:42:22 -0000 1.24
***************
*** 145,149 ****
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
! LIBS="$LIBS -L$withval/lib"
rpath="$rpath:$withval/lib"
]
--- 145,149 ----
CFLAGS="$CFLAGS -I$withval/include"
CPPFLAGS="$CPPFLAGS -I$withval/include"
! LDFLAGS="$LDFLAGS -L$withval/lib"
rpath="$rpath:$withval/lib"
]
***************
*** 161,165 ****
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_libao.o"
! LDFLAGS="$LDFLAGS -lao"
AC_DEFINE(RDPSND_LIBAO)
])
--- 161,165 ----
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_libao.o"
! LIBS="$LIBS -lao"
AC_DEFINE(RDPSND_LIBAO)
])
***************
*** 174,178 ****
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_sgi.o"
! LDFLAGS="$LDFLAGS -laudio"
AC_DEFINE(RDPSND_SGI)
])
--- 174,178 ----
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_sgi.o"
! LIBS="$LIBS -laudio"
AC_DEFINE(RDPSND_SGI)
])
***************
*** 187,191 ****
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_alsa.o"
! LDFLAGS="$LDFLAGS -lasound"
AC_DEFINE(RDPSND_ALSA)
])
--- 187,191 ----
sound=auto
SOUNDOBJ="$SOUNDOBJ rdpsnd_alsa.o"
! LIBS="$LIBS -lasound"
AC_DEFINE(RDPSND_ALSA)
])
Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** proto.h 17 Sep 2006 11:04:49 -0000 1.94
--- proto.h 17 Sep 2006 11:42:22 -0000 1.95
***************
*** 168,172 ****
BOOL rdpsnd_select_driver(char *driver, char *options);
void rdpsnd_show_help(void);
! inline void rdpsnd_play(void);
/* secure.c */
void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
--- 168,172 ----
BOOL rdpsnd_select_driver(char *driver, char *options);
void rdpsnd_show_help(void);
! void rdpsnd_play(void);
/* secure.c */
void sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt);
Index: rdpsnd.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rdpsnd.c 17 Sep 2006 11:04:49 -0000 1.12
--- rdpsnd.c 17 Sep 2006 11:42:22 -0000 1.13
***************
*** 39,43 ****
static VCHANNEL *rdpsnd_channel;
static struct audio_driver *drivers = NULL;
! static struct audio_driver *current_driver = NULL;
static BOOL device_open;
--- 39,43 ----
static VCHANNEL *rdpsnd_channel;
static struct audio_driver *drivers = NULL;
! struct audio_driver *current_driver = NULL;
static BOOL device_open;
***************
*** 45,50 ****
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];
void (*wave_out_play) (void);
--- 45,50 ----
static unsigned int format_count;
static unsigned int current_format;
! unsigned int queue_hi, queue_lo;
! struct audio_packet packet_queue[MAX_QUEUE];
void (*wave_out_play) (void);
Index: rdpsnd.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rdpsnd.h 17 Sep 2006 11:04:49 -0000 1.2
--- rdpsnd.h 17 Sep 2006 11:42:22 -0000 1.3
***************
*** 44,52 ****
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);
/* Driver register functions */
--- 44,52 ----
void rdpsnd_queue_write(STREAM s, uint16 tick, uint8 index);
! 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 */
Index: rdpsnd_alsa.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_alsa.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rdpsnd_alsa.c 17 Sep 2006 11:04:50 -0000 1.3
--- rdpsnd_alsa.c 17 Sep 2006 11:42:22 -0000 1.4
***************
*** 284,303 ****
}
- 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)
{
if (options)
{
--- 284,303 ----
}
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)
{
Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** rdpsnd_libao.c 17 Sep 2006 11:04:50 -0000 1.16
--- rdpsnd_libao.c 17 Sep 2006 11:42:22 -0000 1.17
***************
*** 235,254 ****
}
- 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)
{
if (options)
{
--- 235,254 ----
}
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)
{
Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** rdpsnd_oss.c 17 Sep 2006 11:04:50 -0000 1.22
--- rdpsnd_oss.c 17 Sep 2006 11:42:22 -0000 1.23
***************
*** 253,272 ****
}
- 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)
{
if (options)
{
--- 253,273 ----
}
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)
{
Index: rdpsnd_sgi.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sgi.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** rdpsnd_sgi.c 17 Sep 2006 11:04:50 -0000 1.11
--- rdpsnd_sgi.c 17 Sep 2006 11:42:22 -0000 1.12
***************
*** 309,328 ****
}
- 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)
{
if (options)
{
--- 309,328 ----
}
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)
{
Index: rdpsnd_sun.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sun.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** rdpsnd_sun.c 17 Sep 2006 11:04:50 -0000 1.18
--- rdpsnd_sun.c 17 Sep 2006 11:42:22 -0000 1.19
***************
*** 273,292 ****
}
- 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)
{
if (options)
{
--- 273,293 ----
}
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)
{
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642