projects
/
sxemacs
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document text corruption issue with Xorg ATI driver
[sxemacs]
/
src
/
sysdep.c
diff --git
a/src/sysdep.c
b/src/sysdep.c
index
5e3b447
..
0828973
100644
(file)
--- a/
src/sysdep.c
+++ b/
src/sysdep.c
@@
-41,10
+41,10
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "ui/TTY/console-tty.h" /* for stuff in stuff_char and
others. Seriously in need of
refactoring... */
#include "ui/TTY/console-tty.h" /* for stuff in stuff_char and
others. Seriously in need of
refactoring... */
-#else
-#include "syssignal.h"
-#include "ui/systty.h"
-#endif
/* HAVE_TTY */
+#else
/* !HAVE_TTY */
+#include "syssignal.h"
/* always include before systty.h */
+#include "ui/
TTY/
systty.h"
+#endif /* HAVE_TTY */
#include "ui/console-stream.h"
#include "ui/console-stream.h"
@@
-806,14
+806,14
@@
void setup_pty(int fd)
void init_baud_rate(struct device *d)
{
void init_baud_rate(struct device *d)
{
- struct console *con = XCONSOLE(DEVICE_CONSOLE(d));
if (DEVICE_WIN_P(d) || DEVICE_STREAM_P(d)) {
DEVICE_BAUD_RATE(d) = 38400;
return;
if (DEVICE_WIN_P(d) || DEVICE_STREAM_P(d)) {
DEVICE_BAUD_RATE(d) = 38400;
return;
- }
+ }
#ifdef HAVE_TTY
assert(DEVICE_TTY_P(d));
{
#ifdef HAVE_TTY
assert(DEVICE_TTY_P(d));
{
+ struct console *con = XCONSOLE(DEVICE_CONSOLE(d));
int input_fd = CONSOLE_TTY_DATA(con)->infd;
#if defined (HAVE_TERMIOS)
struct termios sg;
int input_fd = CONSOLE_TTY_DATA(con)->infd;
#if defined (HAVE_TERMIOS)
struct termios sg;
@@
-871,20
+871,26
@@
static void init_sigio_on_device(struct device *d)
int owner = getpid();
int ioctl_status;
if (DEVICE_TTY_P(d)) {
int owner = getpid();
int ioctl_status;
if (DEVICE_TTY_P(d)) {
+#ifdef HAVE_UNIXOID_EVENT_LOOP
ioctl_status = ioctl(filedesc, FIOGSAIOOWN,
&DEVICE_OLD_FCNTL_OWNER(d));
ioctl_status = ioctl(filedesc, FIOGSAIOOWN,
&DEVICE_OLD_FCNTL_OWNER(d));
+#endif
ioctl_status = ioctl(filedesc, FIOSSAIOOWN, &owner);
}
#ifdef HAVE_WINDOW_SYSTEM
else if (!DEVICE_STREAM_P(d)) {
ioctl_status = ioctl(filedesc, FIOSSAIOOWN, &owner);
}
#ifdef HAVE_WINDOW_SYSTEM
else if (!DEVICE_STREAM_P(d)) {
+#ifdef HAVE_UNIXOID_EVENT_LOOP
ioctl_status = ioctl(filedesc, SIOCGPGRP,
&DEVICE_OLD_FCNTL_OWNER(d));
ioctl_status = ioctl(filedesc, SIOCGPGRP,
&DEVICE_OLD_FCNTL_OWNER(d));
+#endif
ioctl_status = ioctl(filedesc, SIOCSPGRP, &owner);
}
#endif
}
#elif defined (F_SETOWN) && !defined (F_SETOWN_BUG)
ioctl_status = ioctl(filedesc, SIOCSPGRP, &owner);
}
#endif
}
#elif defined (F_SETOWN) && !defined (F_SETOWN_BUG)
+# ifdef HAVE_UNIXOID_EVENT_LOOP
DEVICE_OLD_FCNTL_OWNER(d) = fcntl(filedesc, F_GETOWN, 0);
DEVICE_OLD_FCNTL_OWNER(d) = fcntl(filedesc, F_GETOWN, 0);
+# endif
# ifdef F_SETOWN_SOCK_NEG
/* stdin is a socket here */
fcntl(filedesc, F_SETOWN, -getpid());
# ifdef F_SETOWN_SOCK_NEG
/* stdin is a socket here */
fcntl(filedesc, F_SETOWN, -getpid());
@@
-902,18
+908,24
@@
static void reset_sigio_on_device(struct device *d)
{ /* HPUX stuff */
int ioctl_status;
if (DEVICE_TTY_P(d)) {
{ /* HPUX stuff */
int ioctl_status;
if (DEVICE_TTY_P(d)) {
+# ifdef HAVE_UNIXOID_EVENT_LOOP
ioctl_status = ioctl(filedesc, FIOSSAIOOWN,
&DEVICE_OLD_FCNTL_OWNER(d));
ioctl_status = ioctl(filedesc, FIOSSAIOOWN,
&DEVICE_OLD_FCNTL_OWNER(d));
+# endif
}
#ifdef HAVE_WINDOW_SYSTEM
else if (!DEVICE_STREAM_P(d)) {
}
#ifdef HAVE_WINDOW_SYSTEM
else if (!DEVICE_STREAM_P(d)) {
+# ifdef HAVE_UNIXOID_EVENT_LOOP
ioctl_status = ioctl(filedesc, SIOCSPGRP,
&DEVICE_OLD_FCNTL_OWNER(d));
ioctl_status = ioctl(filedesc, SIOCSPGRP,
&DEVICE_OLD_FCNTL_OWNER(d));
+# endif
}
#endif
}
#elif defined (F_SETOWN) && !defined (F_SETOWN_BUG)
}
#endif
}
#elif defined (F_SETOWN) && !defined (F_SETOWN_BUG)
+# ifdef HAVE_UNIXOID_EVENT_LOOP
fcntl(filedesc, F_SETOWN, DEVICE_OLD_FCNTL_OWNER(d));
fcntl(filedesc, F_SETOWN, DEVICE_OLD_FCNTL_OWNER(d));
+# endif
#endif
}
#endif
}
@@
-1359,6
+1371,7
@@
static void tty_init_sys_modes_on_device(struct device *d)
input_fd = CONSOLE_TTY_DATA(con)->infd;
output_fd = CONSOLE_TTY_DATA(con)->outfd;
input_fd = CONSOLE_TTY_DATA(con)->infd;
output_fd = CONSOLE_TTY_DATA(con)->outfd;
+ SXE_SET_UNUSED(output_fd);
emacs_get_tty(input_fd, &CONSOLE_TTY_DATA(con)->old_tty);
tty = CONSOLE_TTY_DATA(con)->old_tty;
emacs_get_tty(input_fd, &CONSOLE_TTY_DATA(con)->old_tty);
tty = CONSOLE_TTY_DATA(con)->old_tty;
@@
-1713,6
+1726,7
@@
static void tty_reset_sys_modes_on_device(struct device *d)
input_fd = CONSOLE_TTY_DATA(con)->infd;
output_fd = CONSOLE_TTY_DATA(con)->outfd;
input_fd = CONSOLE_TTY_DATA(con)->infd;
output_fd = CONSOLE_TTY_DATA(con)->outfd;
+ SXE_SET_UNUSED(output_fd);
#if defined (IBMR2AIX) && defined (AIXHFT)
{
#if defined (IBMR2AIX) && defined (AIXHFT)
{
@@
-2969,6
+2983,10
@@
get_process_times(double *user_time, double *system_time, double *real_time)
#endif
#endif
#endif
#endif
+#if defined HAVE_MPZ && (defined WITH_GMP || defined WITH_MP)
+# include "ent/ent-gmp.h"
+#endif /* MPZ && (GMP || MP) */
+
/* Figure out how many bits the system's random number generator uses.
`random' and `lrand48' are assumed to return 31 usable bits.
BSD `rand' returns a 31 bit value but the low order bits are unusable;
/* Figure out how many bits the system's random number generator uses.
`random' and `lrand48' are assumed to return 31 usable bits.
BSD `rand' returns a 31 bit value but the low order bits are unusable;