From 7a2bd054936fe4afeb4abc8df02844e6a048fbfa Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 15 Mar 2012 02:12:49 +0100 Subject: [PATCH] Fix include guard in tree.h and ngx-queue.h The C99 standard reserves all identifiers (including macros) that start with an underscore and a capital letter. Fixes #260. --- include/uv-private/ngx-queue.h | 6 +++--- include/uv-private/tree.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/uv-private/ngx-queue.h b/include/uv-private/ngx-queue.h index 8c5e46176..7058ce408 100644 --- a/include/uv-private/ngx-queue.h +++ b/include/uv-private/ngx-queue.h @@ -4,8 +4,8 @@ */ -#ifndef _NGX_QUEUE_H_INCLUDED_ -#define _NGX_QUEUE_H_INCLUDED_ +#ifndef NGX_QUEUE_H_INCLUDED_ +#define NGX_QUEUE_H_INCLUDED_ typedef struct ngx_queue_s ngx_queue_t; @@ -103,4 +103,4 @@ struct ngx_queue_s { for ((q) = ngx_queue_head(h); (q) != (h); (q) = ngx_queue_next(q)) -#endif /* _NGX_QUEUE_H_INCLUDED_ */ +#endif /* NGX_QUEUE_H_INCLUDED_ */ diff --git a/include/uv-private/tree.h b/include/uv-private/tree.h index 37966d353..a9c718ec7 100644 --- a/include/uv-private/tree.h +++ b/include/uv-private/tree.h @@ -23,8 +23,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef _UV_TREE_H_ -#define _UV_TREE_H_ +#ifndef UV_TREE_H_ +#define UV_TREE_H_ #define __unused @@ -759,4 +759,4 @@ name##_RB_MINMAX(struct name *head, int val) \ ((x) != NULL) && ((y) = name##_RB_PREV(x), (x) != NULL); \ (x) = (y)) -#endif /* _UV_TREE_H_ */ +#endif /* UV_TREE_H_ */