comparison src/core/nginx.h @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents b4dcae568a2a
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
6 6
7 #ifndef _NGINX_H_INCLUDED_ 7 #ifndef _NGINX_H_INCLUDED_
8 #define _NGINX_H_INCLUDED_ 8 #define _NGINX_H_INCLUDED_
9 9
10 10
11 #define nginx_version 8034 11 #define nginx_version 1000000
12 #define NGINX_VERSION "0.8.34" 12 #define NGINX_VERSION "1.0.0"
13 #define NGINX_VER "nginx/" NGINX_VERSION 13 #define NGINX_VER "nginx/" NGINX_VERSION
14 14
15 #define NGINX_VAR "NGINX" 15 #define NGINX_VAR "NGINX"
16 #define NGX_OLDPID_EXT ".oldbin" 16 #define NGX_OLDPID_EXT ".oldbin"
17 17