projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Add some Adobe-Japan1 code points.
[chise/xemacs-chise.git-]
/
src
/
sound.c
diff --git
a/src/sound.c
b/src/sound.c
index
fe31b7b
..
ec7e9e3
100644
(file)
--- a/
src/sound.c
+++ b/
src/sound.c
@@
-50,8
+50,8
@@
extern int esd_play_sound_data (unsigned char *data, size_t length, int vol);
# define DEVICE_CONNECTED_TO_ESD_P(x) 1 /* FIXME: better check */
#endif
# define DEVICE_CONNECTED_TO_ESD_P(x) 1 /* FIXME: better check */
#endif
-int bell_volume;
-int bell_inhibit_time;
+Fixnum bell_volume;
+Fixnum bell_inhibit_time;
Lisp_Object Vsound_alist;
Lisp_Object Vsynchronous_sounds;
Lisp_Object Vnative_sound_only_on_console;
Lisp_Object Vsound_alist;
Lisp_Object Vsynchronous_sounds;
Lisp_Object Vnative_sound_only_on_console;
@@
-467,7
+467,7
@@
init_nas_sound (struct device *d)
static void
init_native_sound (struct device *d)
{
static void
init_native_sound (struct device *d)
{
- if (DEVICE_TTY_P (d) || DEVICE_STREAM_P (d) || DEVICE_MSWINDOWS_P(d))
+ if (!(DEVICE_X_P(d) || DEVICE_GTK_P(d)))
DEVICE_ON_CONSOLE_P (d) = 1;
#ifdef HAVE_X_WINDOWS
else
DEVICE_ON_CONSOLE_P (d) = 1;
#ifdef HAVE_X_WINDOWS
else
@@
-517,7
+517,7
@@
init_native_sound (struct device *d)
DEVICE_ON_CONSOLE_P (d) = 0;
else
{
DEVICE_ON_CONSOLE_P (d) = 0;
else
{
- char hn [255];
+ char *hn = alloca_array (char, strlen (h->h_name) + 1);
struct hostent *l;
strcpy (hn, h->h_name);
l = gethostbyname (localname);
struct hostent *l;
strcpy (hn, h->h_name);
l = gethostbyname (localname);