Wed Aug 18 18:17:14 PDT 1999 Michael Jennings <mej@eterm.org>
Apparently, FreeBSD has a timer_t already, so I renamed Eterm's. Thanks to Carl Lewis <carl@dpiwe.tas.gov.au> for pointing this out. SVN revision: 56
This commit is contained in:
parent
64a0298be9
commit
52fbe59fac
|
@ -2289,3 +2289,9 @@ Wed Aug 18 14:58:08 PDT 1999 Michael Jennings <mej@eterm.org>
|
||||||
Also cleaned up the XIM code to fit with the rest of Eterm.
|
Also cleaned up the XIM code to fit with the rest of Eterm.
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
Wed Aug 18 18:17:14 PDT 1999 Michael Jennings <mej@eterm.org>
|
||||||
|
|
||||||
|
Apparently, FreeBSD has a timer_t already, so I renamed Eterm's.
|
||||||
|
Thanks to Carl Lewis <carl@dpiwe.tas.gov.au> for pointing this out.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -311,6 +311,7 @@
|
||||||
#undef NO_XLOCALE
|
#undef NO_XLOCALE
|
||||||
#undef GREEK_SUPPORT
|
#undef GREEK_SUPPORT
|
||||||
#undef CONFIG_SEARCH_PATH
|
#undef CONFIG_SEARCH_PATH
|
||||||
|
#undef AUTHORS
|
||||||
|
|
||||||
|
|
||||||
/* Leave that blank line there!! Autoheader needs it.
|
/* Leave that blank line there!! Autoheader needs it.
|
||||||
|
|
|
@ -8,6 +8,7 @@ DATE="`date '+%d %B %Y'`"
|
||||||
AC_SUBST(DATE)
|
AC_SUBST(DATE)
|
||||||
AUTHORS="Michael Jennings (mej@eterm.org) and Tuomo Venäläinen (vendu@cc.hut.fi) "
|
AUTHORS="Michael Jennings (mej@eterm.org) and Tuomo Venäläinen (vendu@cc.hut.fi) "
|
||||||
AC_SUBST(AUTHORS)
|
AC_SUBST(AUTHORS)
|
||||||
|
AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS")
|
||||||
|
|
||||||
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
|
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
|
||||||
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
|
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
|
||||||
|
|
|
@ -479,7 +479,7 @@ usage(void)
|
||||||
unsigned short i, col;
|
unsigned short i, col;
|
||||||
|
|
||||||
printf("Eterm Enlightened Terminal Emulator for X Windows\n");
|
printf("Eterm Enlightened Terminal Emulator for X Windows\n");
|
||||||
printf("Copyright (c) 1997-1999, Tuomo Venalainen and Michael Jennings\n\n");
|
printf("Copyright (c) 1997-1999, " AUTHORS "\n\n");
|
||||||
printf("Usage for " APL_NAME " " VERSION ":\n\n");
|
printf("Usage for " APL_NAME " " VERSION ":\n\n");
|
||||||
printf("%7s %17s %40s\n", "POSIX", "GNU", "Description");
|
printf("%7s %17s %40s\n", "POSIX", "GNU", "Description");
|
||||||
printf("%8s %10s %41s\n", "=======", "===============================",
|
printf("%8s %10s %41s\n", "=======", "===============================",
|
||||||
|
|
14
src/timer.c
14
src/timer.c
|
@ -45,20 +45,20 @@ static const char cvs_ident[] = "$Id$";
|
||||||
#include "pixmap.h"
|
#include "pixmap.h"
|
||||||
#include "timer.h"
|
#include "timer.h"
|
||||||
|
|
||||||
static timer_t *timers = NULL;
|
static etimer_t *timers = NULL;
|
||||||
|
|
||||||
timerhdl_t
|
timerhdl_t
|
||||||
timer_add(unsigned long msec, timer_handler_t handler, void *data) {
|
timer_add(unsigned long msec, timer_handler_t handler, void *data) {
|
||||||
|
|
||||||
static timer_t *timer;
|
static etimer_t *timer;
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
static struct timezone tz;
|
static struct timezone tz;
|
||||||
|
|
||||||
if (!timers) {
|
if (!timers) {
|
||||||
timers = (timer_t *) MALLOC(sizeof(timer_t));
|
timers = (etimer_t *) MALLOC(sizeof(etimer_t));
|
||||||
timer = timers;
|
timer = timers;
|
||||||
} else {
|
} else {
|
||||||
timer->next = (timer_t *) MALLOC(sizeof(timer_t));
|
timer->next = (etimer_t *) MALLOC(sizeof(etimer_t));
|
||||||
timer = timer->next;
|
timer = timer->next;
|
||||||
}
|
}
|
||||||
timer->msec = msec;
|
timer->msec = msec;
|
||||||
|
@ -75,8 +75,8 @@ timer_add(unsigned long msec, timer_handler_t handler, void *data) {
|
||||||
unsigned char
|
unsigned char
|
||||||
timer_del(timerhdl_t handle) {
|
timer_del(timerhdl_t handle) {
|
||||||
|
|
||||||
register timer_t *current;
|
register etimer_t *current;
|
||||||
timer_t *temp;
|
etimer_t *temp;
|
||||||
|
|
||||||
if (timers == handle) {
|
if (timers == handle) {
|
||||||
timers = handle->next;
|
timers = handle->next;
|
||||||
|
@ -113,7 +113,7 @@ timer_change_delay(timerhdl_t handle, unsigned long msec) {
|
||||||
void
|
void
|
||||||
timer_check(void) {
|
timer_check(void) {
|
||||||
|
|
||||||
register timer_t *current;
|
register etimer_t *current;
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
static struct timezone tz;
|
static struct timezone tz;
|
||||||
|
|
||||||
|
|
|
@ -39,8 +39,8 @@
|
||||||
|
|
||||||
/************ Structures ************/
|
/************ Structures ************/
|
||||||
typedef unsigned char (*timer_handler_t)(void *);
|
typedef unsigned char (*timer_handler_t)(void *);
|
||||||
typedef struct timer_struct timer_t;
|
typedef struct timer_struct etimer_t;
|
||||||
typedef timer_t *timerhdl_t; /* The timer handles are actually pointers to a timer_t struct, but clients shouldn't use them as such. */
|
typedef etimer_t *timerhdl_t; /* The timer handles are actually pointers to a etimer_t struct, but clients shouldn't use them as such. */
|
||||||
struct timer_struct {
|
struct timer_struct {
|
||||||
unsigned long msec;
|
unsigned long msec;
|
||||||
struct timeval time;
|
struct timeval time;
|
||||||
|
|
Loading…
Reference in New Issue