old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Michael Jennings 1999-08-19 01:22:17 +00:00
parent 64a0298be9
commit 52fbe59fac
6 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.
-------------------------------------------------------------------------------
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.
-------------------------------------------------------------------------------

1
acconfig.h
View File

@ -311,6 +311,7 @@
#undef NO_XLOCALE
#undef GREEK_SUPPORT
#undef CONFIG_SEARCH_PATH
#undef AUTHORS
/* Leave that blank line there!! Autoheader needs it.

1
configure.in
View File

@ -8,6 +8,7 @@ DATE="`date '+%d %B %Y'`"
AC_SUBST(DATE)
AUTHORS="Michael Jennings (mej@eterm.org) and Tuomo Venäläinen (vendu@cc.hut.fi) "
AC_SUBST(AUTHORS)
AC_DEFINE_UNQUOTED(AUTHORS, "$AUTHORS")
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then

2
src/options.c
View File

@ -479,7 +479,7 @@ usage(void)
unsigned short i, col;
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("%7s %17s %40s\n", "POSIX", "GNU", "Description");
printf("%8s %10s %41s\n", "=======", "===============================",

14
src/timer.c
View File

@ -45,20 +45,20 @@ static const char cvs_ident[] = "$Id$";
#include "pixmap.h"
#include "timer.h"
static timer_t *timers = NULL;
static etimer_t *timers = NULL;
timerhdl_t
timer_add(unsigned long msec, timer_handler_t handler, void *data) {
static timer_t *timer;
static etimer_t *timer;
struct timeval tv;
static struct timezone tz;
if (!timers) {
timers = (timer_t *) MALLOC(sizeof(timer_t));
timers = (etimer_t *) MALLOC(sizeof(etimer_t));
timer = timers;
} else {
timer->next = (timer_t *) MALLOC(sizeof(timer_t));
timer->next = (etimer_t *) MALLOC(sizeof(etimer_t));
timer = timer->next;
}
timer->msec = msec;
@ -75,8 +75,8 @@ timer_add(unsigned long msec, timer_handler_t handler, void *data) {
unsigned char
timer_del(timerhdl_t handle) {
register timer_t *current;
timer_t *temp;
register etimer_t *current;
etimer_t *temp;
if (timers == handle) {
timers = handle->next;
@ -113,7 +113,7 @@ timer_change_delay(timerhdl_t handle, unsigned long msec) {
void
timer_check(void) {
register timer_t *current;
register etimer_t *current;
struct timeval tv;
static struct timezone tz;

4
src/timer.h
View File

@ -39,8 +39,8 @@
/************ Structures ************/
typedef unsigned char (*timer_handler_t)(void *);
typedef struct timer_struct timer_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 struct timer_struct etimer_t;
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 {
unsigned long msec;
struct timeval time;