(Fnext_property_change): Properly offset interval

[gnu-emacs] / src / hftctl.c

diff --git a/src/hftctl.c b/src/hftctl.c
index 7f6cc9194955eb0052511d4e4415000c23e1a40b..5fe816abbb502e8ac0bd3f1ba2f14d5e0ab5d783 100644 (file)
--- a/src/hftctl.c
+++ b/src/hftctl.c
@@ -20,7 +20,7 @@
 /*      2. places fildes into raw mode                         */
 /*      3. converts ioctl arguments to datastream              */
 /*      4. waits for 2 secs for acknowledgement before         */
-/*         timimg out.                                         */
+/*         timing out.                                         */
 /*      5. places response in callers buffer ( just like       */
 /*         ioctl.                                              */
 /*      6. returns fildes to its original mode                 */
@@ -41,13 +41,15 @@
 /*                                                             */
 /***************************************************************/
 
+#include <sys/signal.h>
+#include <errno.h>
+
+#include <config.h>
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <errno.h>
 #include <setjmp.h>
 #include <sys/ioctl.h>
-#include <sys/signal.h>
 #include <sys/devinfo.h>
 #include <termios.h>
 #include <termio.h>
@@ -55,6 +57,7 @@
 #include <sys/uio.h>
 #include <sys/tty.h>
 /* #include <sys/pty.h> */
+
 #define REMOTE 0x01
 
 #undef ioctl
@@ -62,8 +65,6 @@ static char     SCCSid[] = "com/gnuemacs/src,3.1,9021-90/05/03-5/3/90";
 
 /*************** LOCAL DEFINES **********************************/
 
-typedef int    (*FUNC)();     /* pointer to a function        */
-
 #define QDEV   ((HFQPDEVCH<<8)|HFQPDEVCL)
 #define QLOC   ((HFQLOCCH<<8)|HFQLOCCL)
 #define QPS    ((HFQPRESCH<<8)|HFQPRESCL)
@@ -84,7 +85,7 @@ static int              hfskbd();
 extern int              errno;
 static jmp_buf          hftenv;
 static int              is_ack_vtd;
-static FUNC             sav_alrm;
+static SIGTYPE             (*sav_alrm) ();
 static struct hfctlreq  req =
                        { 0x1b,'[','x',0,0,0,21,HFCTLREQCH,HFCTLREQCL};
 static struct hfctlack  ACK =