6 files changed, 26 insertions, 27 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;
 
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index 55629a1a9..a78c40c6b 100644
--- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h
@@ -8,7 +8,6 @@
 
 #define NGX_WRITE_SHUTDOWN SD_SEND
 
-#define INET_ADDRSTRLEN     16
 
 typedef SOCKET  ngx_socket_t;
 typedef int     socklen_t;
diff --git a/src/os/win32/ngx_types.h b/src/os/win32/ngx_types.h
index b858faee9..c009b5aa9 100644
--- a/src/os/win32/ngx_types.h
+++ b/src/os/win32/ngx_types.h
@@ -16,10 +16,10 @@ typedef unsigned __int64            off_t;
 typedef BY_HANDLE_FILE_INFORMATION  ngx_file_info_t;
 
 
-#define QD_FMT            "%I64d"
-#define QX_FMT            "%I64x"
-#define OFF_FMT           "%I64d"
-#define PID_FMT           "%d"
+#define OFF_FMT    "%I64d"
+#define SIZE_FMT   "%d"
+#define SIZEX_FMT  "%x"
+#define PID_FMT    "%d"
 
 
 #endif /* _NGX_TYPES_H_INCLUDED_ */