OSSP CVS Repository

Check-in Number:	1254
Date:	2001-Nov-04 15:11:04 (local) 2001-Nov-04 14:11:04 (UTC)
User:	rse
Branch:
Comment:	be pedantic about syntax in order to be really portable
Tickets:
Inspections:
Files:	ossp-pkg/l2/l2_ch_buffer.c      1.31 -> 1.32     5 inserted, 5 deleted

---

ossp-pkg/l2/l2_ch_buffer.c 1.31 -> 1.32

--- l2_ch_buffer.c 2001/11/03 22:51:36 1.31 +++ l2_ch_buffer.c 2001/11/04 14:11:04 1.32 @@ -47,7 +47,7 @@ int bufsize; long bufinterval; struct sigaction sigalrm; -#if defined HAVE_SETITIMER && defined HAVE_SYS_TIME_H +#if defined(HAVE_SETITIMER) && defined(HAVE_SYS_TIME_H) struct itimerval valprev; #endif int levelflush; @@ -57,7 +57,7 @@ /* Sets the VIRTUAL timer to preconfigured value in cfg */ static int set_alarm(l2_ch_buffer_t *cfg) { -#if defined HAVE_SETITIMER && defined HAVE_SYS_TIME_H +#if defined(HAVE_SETITIMER) && defined(HAVE_SYS_TIME_H) struct itimerval valtest, valnew; /* initialize auto vars before using them */ @@ -91,7 +91,7 @@ /* Resets the VIRTUAL timer to preconfigured value in cfg */ static int reset_alarm(l2_ch_buffer_t *cfg) { -#if defined HAVE_SETITIMER && defined HAVE_SYS_TIME_H +#if defined(HAVE_SETITIMER) && defined(HAVE_SYS_TIME_H) struct itimerval valnew; /* initialize auto vars before using them */ @@ -144,7 +144,7 @@ cfg->levelflush = 0; cfg->level = L2_LEVEL_NONE; memset(&cfg->sigalrm, 0, sizeof(cfg->sigalrm)); -#if defined HAVE_SETITIMER && defined HAVE_SYS_TIME_H +#if defined(HAVE_SETITIMER) && defined(HAVE_SYS_TIME_H) memset(&cfg->valprev, 0, sizeof(cfg->valprev)); #endif @@ -292,7 +292,7 @@ l2_result_t rv; if ((cfg->bufinterval != 0) && (cfg->bufinterval != -1L)) { -#if defined HAVE_SETITIMER && defined HAVE_SYS_TIME_H +#if defined(HAVE_SETITIMER) && defined(HAVE_SYS_TIME_H) if (setitimer(L2_BUFFER_TIMER, &cfg->valprev, 0)) /* restore timer */ return L2_ERR_SYS; #else