diff options
| author | Jérôme Loyet <fat@php.net> | 2010-11-11 12:55:05 +0000 |
|---|---|---|
| committer | Jérôme Loyet <fat@php.net> | 2010-11-11 12:55:05 +0000 |
| commit | 9f1ad0a2e256e59c58e8b755f68fe21ca52298cd (patch) | |
| tree | 44a145380e60fc56bb5adad998afb1facee51a6c | |
| parent | b38d57249e247a2bcf5f285185cae237928f90f9 (diff) | |
| download | php-git-9f1ad0a2e256e59c58e8b755f68fe21ca52298cd.tar.gz | |
- add missing timer* macros (for solaris)
- ws
| -rw-r--r-- | sapi/fpm/fpm/fpm_config.h | 73 |
1 files changed, 53 insertions, 20 deletions
diff --git a/sapi/fpm/fpm/fpm_config.h b/sapi/fpm/fpm/fpm_config.h index 50fb6e52ca..3637f376c2 100644 --- a/sapi/fpm/fpm/fpm_config.h +++ b/sapi/fpm/fpm/fpm_config.h @@ -1,50 +1,83 @@ - - /* $Id: fpm_config.h,v 1.16 2008/05/25 00:30:43 anight Exp $ */ - /* (c) 2007,2008 Andrei Nigmatulin */ +/* $Id: fpm_config.h,v 1.16 2008/05/25 00:30:43 anight Exp $ */ +/* (c) 2007,2008 Andrei Nigmatulin */ #include <php_config.h> + #ifdef FPM_AUTOCONFIG_H -#include <fpm_autoconfig.h> +# include <fpm_autoconfig.h> #endif /* Solaris does not have it */ #ifndef INADDR_NONE -#define INADDR_NONE (-1) +# define INADDR_NONE (-1) #endif /* If we're not using GNU C, elide __attribute__ */ #ifndef __GNUC__ -# define __attribute__(x) /*NOTHING*/ +# define __attribute__(x) /*NOTHING*/ #endif +/* Missing timer* macros (for solaris) */ +#ifndef timerisset +# define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) +#endif + +#ifndef timerclear +# define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0) +#endif -/* Solaris does not have it */ #ifndef timersub -#define timersub(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ - if ((vvp)->tv_usec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_usec += 1000000; \ - } \ +# define timersub(tvp, uvp, vvp) \ + do { \ + (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ + (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ + if ((vvp)->tv_usec < 0) { \ + (vvp)->tv_sec--; \ + (vvp)->tv_usec += 1000000; \ + } \ } while (0) #endif +#ifndef timeradd +# define timeradd(a, b, result) \ + do { \ + (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \ + if ((result)->tv_usec >= 1000000) \ + { \ + ++(result)->tv_sec; \ + (result)->tv_usec -= 1000000; \ + } \ + } while (0) +#endif + +#ifndef timercmp +/* does not work for >= and <= */ +# define timercmp(a, b, CMP) \ + (((a)->tv_sec == (b)->tv_sec) ? \ + ((a)->tv_usec CMP (b)->tv_usec) : \ + ((a)->tv_sec CMP (b)->tv_sec)) +#endif +/* endof timer* macros */ + #ifndef MIN -#define MIN(a,b) (((a)<(b))?(a):(b)) +# define MIN(a,b) (((a)<(b))?(a):(b)) +#endif + +#ifndef MAX +# define MAX(a,b) (((a)>(b))?(a):(b)) #endif #if defined(HAVE_PTRACE) || defined(PROC_MEM_FILE) || defined(HAVE_MACH_VM_READ) -#define HAVE_FPM_TRACE 1 +# define HAVE_FPM_TRACE 1 #else -#define HAVE_FPM_TRACE 0 +# define HAVE_FPM_TRACE 0 #endif #if defined(HAVE_LQ_TCP_INFO) || defined(HAVE_LQ_SO_LISTENQ) -#define HAVE_FPM_LQ 1 +# define HAVE_FPM_LQ 1 #else -#define HAVE_FPM_LQ 0 +# define HAVE_FPM_LQ 0 #endif |