diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2003-06-12 05:54:39 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2003-06-12 05:54:39 +0000 |
| commit | 0915977df53c486abbc6081e1c83f9f8e7a8f111 (patch) | |
| tree | 778b5191eed39b3043798423ccc23708e65f116f /src/os/unix | |
| parent | 239baac646073cab7bbaf537ba2d6ca844f2c992 (diff) | |
| download | nginx-0915977df53c486abbc6081e1c83f9f8e7a8f111.tar.gz nginx-0915977df53c486abbc6081e1c83f9f8e7a8f111.zip | |
nginx-0.0.1-2003-06-12-09:54:39 import
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_freebsd_config.h | 25 | ||||
| -rw-r--r-- | src/os/unix/ngx_linux_config.h | 9 | ||||
| -rw-r--r-- | src/os/unix/ngx_solaris_config.h | 8 | ||||
| -rw-r--r-- | src/os/unix/ngx_time.h | 2 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/os/unix/ngx_freebsd_config.h b/src/os/unix/ngx_freebsd_config.h index 6fd0a694e..64175fe82 100644 --- a/src/os/unix/ngx_freebsd_config.h +++ b/src/os/unix/ngx_freebsd_config.h @@ -22,22 +22,21 @@ #include <osreldate.h> -/* STUB */ -#define QD_FMT "%lld" -#define QX_FMT "%llx" -/**/ - #if (i386) -#define OFF_FMT "%lld" -#define SIZE_FMT "%d" -#define SIZEX_FMT "%x" -#else -#define OFF_FMT "%ld" -#define SIZE_FMT "%ld" -#define SIZEX_FMT "%lx" + +#define OFF_FMT "%lld" +#define SIZE_FMT "%d" +#define SIZEX_FMT "%x" + +#else /* amd64, alpha, sparc64, ia64 */ + +#define OFF_FMT "%ld" +#define SIZE_FMT "%ld" +#define SIZEX_FMT "%lx" + #endif -#define PID_FMT "%d" +#define PID_FMT "%d" #ifndef HAVE_SELECT diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h index 27fa317bc..9056657f4 100644 --- a/src/os/unix/ngx_linux_config.h +++ b/src/os/unix/ngx_linux_config.h @@ -30,10 +30,11 @@ -#define QD_FMT "%qd" -#define QX_FMT "%qx" -#define OFF_FMT "%qd" -#define PID_FMT "%d" +#define OFF_FMT "%lld" +#define SIZE_FMT "%d" +#define SIZEX_FMT "%x" +#define PID_FMT "%d" + #ifndef HAVE_SELECT diff --git a/src/os/unix/ngx_solaris_config.h b/src/os/unix/ngx_solaris_config.h index 78eeb7213..a5b66c465 100644 --- a/src/os/unix/ngx_solaris_config.h +++ b/src/os/unix/ngx_solaris_config.h @@ -27,10 +27,10 @@ typedef uint32_t u_int32_t; -#define QD_FMT "%lld" -#define QX_FMT "%llx" -#define OFF_FMT "%lld" -#define PID_FMT "%ld" +#define OFF_FMT "%lld" +#define SIZE_FMT "%d" +#define SIZEX_FMT "%x" +#define PID_FMT "%ld" #ifndef HAVE_SELECT diff --git a/src/os/unix/ngx_time.h b/src/os/unix/ngx_time.h index 4b5fa5949..ee5b47f9d 100644 --- a/src/os/unix/ngx_time.h +++ b/src/os/unix/ngx_time.h @@ -5,7 +5,7 @@ #include <ngx_config.h> typedef u_int ngx_msec_t; -#define NGX_MAX_MSEC (u_int) ~0 +#define NGX_MAX_MSEC (u_int) -1 typedef struct tm ngx_tm_t; |