diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-08-27 15:56:14 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2007-08-27 15:56:14 -0700 |
| commit | 44d9468edbbbb19d73c488345ceef1073d1df3a7 (patch) | |
| tree | aa3b49e3edb7b78a42f59d51b9c111869c991a7c | |
| parent | ef35876a808a3cfbefecf59434118cb4d5cd3c3e (diff) | |
Use autoconf to check for usleep before falling into twisty #ifdef maze
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | xset.c | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3c91865..a43b200 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,9 @@ AM_CONFIG_HEADER(config.h) AC_PROG_CC AC_PROG_INSTALL +# Checks for system functions +AC_CHECK_FUNCS([usleep]) + # Checks for pkg-config packages PKG_CHECK_MODULES(XSET, xmuu) @@ -87,8 +87,10 @@ in this Software without prior written authorization from The Open Group. #endif #undef BOOL #endif -#if defined(SVR4) && defined(sun) -#include <sys/syscall.h> +#ifndef HAVE_USLEEP +# if defined(SVR4) && defined(sun) +# include <sys/syscall.h> +# endif #endif #endif /* DPMSExtension */ @@ -575,6 +577,9 @@ for (i = 1; i < argc; ) { * * On OS/2, use _sleep2() */ +#ifdef HAVE_USLEEP +# define Usleep(us) usleep((us)) +#else #ifdef SVR4 # ifdef sun /* Anything to avoid linking with -lposix4 */ @@ -610,6 +615,7 @@ for (i = 1; i < argc; ) { # define Usleep(us) usleep((us)) # endif #endif +#endif /* HAVE_USLEEP */ if (strcmp(arg, "on") == 0) { DPMSEnable(dpy); |