c-nginx-nginx-add-preproc-two-lines

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

translation_unit

comment "/*\n * Copyright (C) Igor Sysoev\n * Copyright (C) Nginx, Inc."...

preproc_ifdef

#ifndef "#ifndef"

identifier "_NGX_WIN32_CONFIG_H_INCLUDED_"

preproc_def

#define "#define"

identifier "_NGX_WIN32_CONFIG_H_INCLUDED_"

preproc_call

preproc_directive "#undef"

preproc_arg "WIN32"

preproc_def

#define "#define"

identifier "WIN32"

preproc_arg "0x0400"

preproc_def

#define "#define"

identifier "_WIN32_WINNT"

preproc_arg "0x0501"

preproc_def

#define "#define"

identifier "STRICT"

preproc_def

#define "#define"

identifier "WIN32_LEAN_AND_MEAN"

comment "/* enable getenv() and gmtime() in msvc8 */"

preproc_def

#define "#define"

identifier "_CRT_SECURE_NO_WARNINGS"

preproc_def

#define "#define"

identifier "_CRT_SECURE_NO_DEPRECATE"

comment "/* enable gethostbyname() in msvc2015 */"

preproc_if

#if "#if"

unary_expression

! "!"

parenthesized_expression

( "("

identifier "NGX_HAVE_INET6"

) ")"

"\n"

preproc_def

#define "#define"

identifier "_WINSOCK_DEPRECATED_NO_WARNINGS"

#endif "#endif"

comment "/*\n * we need to include <windows.h> explicitly before <wins"...

preproc_include

#include "#include"

system_lib_string "<windows.h>"

preproc_ifdef

#ifdef "#ifdef"

identifier "_MSC_VER"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4201)"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<winsock2.h>"

preproc_include

#include "#include"

system_lib_string "<ws2tcpip.h>"

comment "/* ipv6 */"

preproc_include

#include "#include"

system_lib_string "<mswsock.h>"

preproc_include

#include "#include"

system_lib_string "<shellapi.h>"

preproc_include

#include "#include"

system_lib_string "<stddef.h>"

comment "/* offsetof() */"

preproc_ifdef (+22 nodes collapsed)

preproc_include

#include "#include"

system_lib_string "<stdio.h>"

preproc_include

#include "#include"

system_lib_string "<stdlib.h>"

preproc_include

#include "#include"

system_lib_string "<stdarg.h>"

preproc_ifdef

#ifdef "#ifdef"

identifier "__GNUC__"

preproc_include

#include "#include"

system_lib_string "<stdint.h>"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<ctype.h>"

preproc_include

#include "#include"

system_lib_string "<locale.h>"

preproc_ifdef

#ifdef "#ifdef"

identifier "__WATCOMC__"

preproc_def

#define "#define"

identifier "_TIME_T_DEFINED"

type_definition

typedef "typedef"

sized_type_specifier

long "long"

type_identifier "time_t"

; ";"

comment "/* OpenWatcom defines time_t as \"unsigned long\" */"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<time.h>"

comment "/* localtime(), strftime() */"

preproc_ifdef

#ifdef "#ifdef"

identifier "_MSC_VER"

comment "/* the end of the precompiled headers */"

preproc_call

preproc_directive "#pragma"

preproc_arg "hdrstop"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(default:4201)"

comment "/* 'type cast': from function pointer to data pointer */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4054)"

comment "/* 'type cast': from data pointer to function pointer */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4055)"

comment "/* 'function' : different 'const' qualifiers */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4090)"

comment "/* unreferenced formal parameter */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4100)"

comment "/* FD_SET() and FD_CLR(): conditional expression is constant"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4127)"

comment "/* conversion from 'type1' to 'type2', possible loss of data"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4244)"

comment "/* conversion from 'size_t' to 'type', possible loss of data"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4267)"

comment "/* array is too small to include a terminating null characte"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4295)"

#endif "#endif"

preproc_ifdef

#ifdef "#ifdef"

identifier "__WATCOMC__"

comment "/* symbol 'ngx_rbtree_min' has been defined, but not referen"...

preproc_call

preproc_directive "#pragma"

preproc_arg "disable_message(202)"

#endif "#endif"

preproc_ifdef

#ifdef "#ifdef"

identifier "__BORLANDC__"

comment "/* the end of the precompiled headers */"

preproc_call

preproc_directive "#pragma"

preproc_arg "hdrstop"

comment "/* functions containing (for|while|some if) are not expanded"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warn -8027"

comment "/* unreferenced formal parameter */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warn -8057"

comment "/* suspicious pointer arithmetic */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warn -8072"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<ngx_auto_config.h>"

preproc_def

#define "#define"

identifier "ngx_inline"

preproc_arg "__inline"

preproc_def

#define "#define"

identifier "ngx_cdecl"

preproc_arg "__cdecl"

preproc_ifdef (+82 nodes collapsed)

type_definition

typedef "typedef"

type_identifier "__int64"

primitive_type "int64_t"

; ";"

type_definition

typedef "typedef"

sized_type_specifier

unsigned "unsigned"

type_identifier "__int64"

primitive_type "uint64_t"

; ";"

preproc_if

#if "#if"

identifier "__BORLANDC__"

"\n"

type_definition

typedef "typedef"

primitive_type "int"

primitive_type "intptr_t"

; ";"

type_definition

typedef "typedef"

type_identifier "u_int"

primitive_type "uintptr_t"

; ";"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "__MINGW64_VERSION_MAJOR"

comment "/* Windows defines off_t as long, which is 32-bit */"

type_definition

typedef "typedef"

type_identifier "__int64"

type_identifier "off_t"

; ";"

preproc_def

#define "#define"

identifier "_OFF_T_DEFINED"

#endif "#endif"

preproc_ifdef (+40 nodes collapsed)

preproc_ifdef

#ifndef "#ifndef"

identifier "__GNUC__"

preproc_ifdef

#ifdef "#ifdef"

identifier "_WIN64"

type_definition

typedef "typedef"

type_identifier "__int64"

primitive_type "ssize_t"

; ";"

preproc_else

#else "#else"

type_definition

typedef "typedef"

primitive_type "int"

primitive_type "ssize_t"

; ";"

#endif "#endif"

type_definition

typedef "typedef"

primitive_type "uint32_t"

type_identifier "in_addr_t"

; ";"

type_definition

typedef "typedef"

type_identifier "u_short"

type_identifier "in_port_t"

; ";"

type_definition

typedef "typedef"

primitive_type "int"

type_identifier "sig_atomic_t"

; ";"

preproc_ifdef (+54 nodes collapsed)

preproc_def

#define "#define"

identifier "NGX_OFF_T_LEN"

preproc_arg "(sizeof(\"-9223372036854775807\") - 1)"

preproc_def

#define "#define"

identifier "NGX_MAX_OFF_T_VALUE"

preproc_arg "9223372036854775807"

preproc_def

#define "#define"

identifier "NGX_SIG_ATOMIC_T_SIZE"

preproc_arg "4"

preproc_def

#define "#define"

identifier "NGX_HAVE_LITTLE_ENDIAN"

preproc_arg "1"

preproc_def

#define "#define"

identifier "NGX_HAVE_NONALIGNED"

preproc_arg "1"

preproc_def

#define "#define"

identifier "NGX_WIN_NT"

preproc_arg "200000"

preproc_def

#define "#define"

identifier "NGX_LISTEN_BACKLOG"

preproc_arg "511"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_INHERITED_NONBLOCK"

preproc_def

#define "#define"

identifier "NGX_HAVE_INHERITED_NONBLOCK"

preproc_arg "1"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_CASELESS_FILESYSTEM"

preproc_def

#define "#define"

identifier "NGX_HAVE_CASELESS_FILESYSTEM"

preproc_arg "1"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_WIN32_TRANSMITPACKETS"

preproc_def

#define "#define"

identifier "NGX_HAVE_WIN32_TRANSMITPACKETS"

preproc_arg "1"

preproc_def

#define "#define"

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

preproc_arg "0"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

preproc_def

#define "#define"

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

preproc_arg "1"

#endif "#endif"

preproc_if

#if "#if"

binary_expression

parenthesized_expression

( "("

identifier "NGX_HAVE_WIN32_TRANSMITPACKETS"

) ")"

|| "||"

parenthesized_expression

( "("

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

) ")"

"\n"

preproc_def

#define "#define"

identifier "NGX_HAVE_SENDFILE"

preproc_arg "1"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_SO_SNDLOWAT"

comment "/* setsockopt(SO_SNDLOWAT) returns error WSAENOPROTOOPT */"

preproc_def

#define "#define"

identifier "NGX_HAVE_SO_SNDLOWAT"

preproc_arg "0"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_FIONREAD"

preproc_def

#define "#define"

identifier "NGX_HAVE_FIONREAD"

preproc_arg "1"

#endif "#endif"

preproc_def

#define "#define"

identifier "NGX_HAVE_GETADDRINFO"

preproc_arg "1"

preproc_def

#define "#define"

identifier "ngx_random"

preproc_arg "rand"

preproc_function_def

#define "#define"

identifier "ngx_debug_init"

preproc_params

( "("

) ")"

#endif "#endif"

comment "/* _NGX_WIN32_CONFIG_H_INCLUDED_ */"

After

translation_unit

comment "/*\n * Copyright (C) Igor Sysoev\n * Copyright (C) Nginx, Inc."...

preproc_ifdef

#ifndef "#ifndef"

identifier "_NGX_WIN32_CONFIG_H_INCLUDED_"

preproc_def

#define "#define"

identifier "_NGX_WIN32_CONFIG_H_INCLUDED_"

preproc_call

preproc_directive "#undef"

preproc_arg "WIN32"

preproc_def

#define "#define"

identifier "WIN32"

preproc_arg "0x0400"

preproc_def

#define "#define"

identifier "_WIN32_WINNT"

preproc_arg "0x0501"

preproc_def

#define "#define"

identifier "STRICT"

preproc_def

#define "#define"

identifier "WIN32_LEAN_AND_MEAN"

comment "/* enable getenv() and gmtime() in msvc8 */"

preproc_def

#define "#define"

identifier "_CRT_SECURE_NO_WARNINGS"

preproc_def

#define "#define"

identifier "_CRT_SECURE_NO_DEPRECATE"

comment "/* enable gethostbyname() in msvc2015 */"

preproc_if

#if "#if"

unary_expression

! "!"

parenthesized_expression

( "("

identifier "NGX_HAVE_INET6"

) ")"

"\n"

preproc_def

#define "#define"

identifier "_WINSOCK_DEPRECATED_NO_WARNINGS"

#endif "#endif"

comment "/*\n * we need to include <windows.h> explicitly before <wins"...

preproc_include

#include "#include"

system_lib_string "<windows.h>"

preproc_ifdef

#ifdef "#ifdef"

identifier "_MSC_VER"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4201)"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<winsock2.h>"

preproc_include

#include "#include"

system_lib_string "<ws2tcpip.h>"

comment "/* ipv6 */"

preproc_include

#include "#include"

system_lib_string "<mswsock.h>"

preproc_include

#include "#include"

system_lib_string "<shellapi.h>"

preproc_include

#include "#include"

system_lib_string "<stddef.h>"

comment "/* offsetof() */"

preproc_ifdef (+22 nodes collapsed)

preproc_include

#include "#include"

system_lib_string "<stdio.h>"

preproc_include

#include "#include"

system_lib_string "<stdlib.h>"

preproc_include

#include "#include"

system_lib_string "<stdarg.h>"

preproc_ifdef

#ifdef "#ifdef"

identifier "__GNUC__"

preproc_include

#include "#include"

system_lib_string "<stdint.h>"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<ctype.h>"

preproc_include

#include "#include"

system_lib_string "<locale.h>"

preproc_ifdef

#ifdef "#ifdef"

identifier "__WATCOMC__"

preproc_def

#define "#define"

identifier "_TIME_T_DEFINED"

type_definition

typedef "typedef"

sized_type_specifier

long "long"

type_identifier "time_t"

; ";"

comment "/* OpenWatcom defines time_t as \"unsigned long\" */"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<time.h>"

comment "/* localtime(), strftime() */"

preproc_ifdef

#ifdef "#ifdef"

identifier "_MSC_VER"

comment "/* the end of the precompiled headers */"

preproc_call

preproc_directive "#pragma"

preproc_arg "hdrstop"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(default:4201)"

comment "/* 'type cast': from function pointer to data pointer */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4054)"

comment "/* 'type cast': from data pointer to function pointer */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4055)"

comment "/* 'function' : different 'const' qualifiers */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4090)"

comment "/* unreferenced formal parameter */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4100)"

comment "/* FD_SET() and FD_CLR(): conditional expression is constant"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4127)"

comment "/* conversion from 'type1' to 'type2', possible loss of data"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4244)"

comment "/* conversion from 'size_t' to 'type', possible loss of data"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4267)"

comment "/* array is too small to include a terminating null characte"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4295)"

comment "/* conversion from 'type1' to 'type2' of greater size */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warning(disable:4306)"

#endif "#endif"

preproc_ifdef

#ifdef "#ifdef"

identifier "__WATCOMC__"

comment "/* symbol 'ngx_rbtree_min' has been defined, but not referen"...

preproc_call

preproc_directive "#pragma"

preproc_arg "disable_message(202)"

#endif "#endif"

preproc_ifdef

#ifdef "#ifdef"

identifier "__BORLANDC__"

comment "/* the end of the precompiled headers */"

preproc_call

preproc_directive "#pragma"

preproc_arg "hdrstop"

comment "/* functions containing (for|while|some if) are not expanded"...

preproc_call

preproc_directive "#pragma"

preproc_arg "warn -8027"

comment "/* unreferenced formal parameter */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warn -8057"

comment "/* suspicious pointer arithmetic */"

preproc_call

preproc_directive "#pragma"

preproc_arg "warn -8072"

#endif "#endif"

preproc_include

#include "#include"

system_lib_string "<ngx_auto_config.h>"

preproc_def

#define "#define"

identifier "ngx_inline"

preproc_arg "__inline"

preproc_def

#define "#define"

identifier "ngx_cdecl"

preproc_arg "__cdecl"

preproc_ifdef (+82 nodes collapsed)

type_definition

typedef "typedef"

type_identifier "__int64"

primitive_type "int64_t"

; ";"

type_definition

typedef "typedef"

sized_type_specifier

unsigned "unsigned"

type_identifier "__int64"

primitive_type "uint64_t"

; ";"

preproc_if

#if "#if"

identifier "__BORLANDC__"

"\n"

type_definition

typedef "typedef"

primitive_type "int"

primitive_type "intptr_t"

; ";"

type_definition

typedef "typedef"

type_identifier "u_int"

primitive_type "uintptr_t"

; ";"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "__MINGW64_VERSION_MAJOR"

comment "/* Windows defines off_t as long, which is 32-bit */"

type_definition

typedef "typedef"

type_identifier "__int64"

type_identifier "off_t"

; ";"

preproc_def

#define "#define"

identifier "_OFF_T_DEFINED"

#endif "#endif"

preproc_ifdef (+40 nodes collapsed)

preproc_ifdef

#ifndef "#ifndef"

identifier "__GNUC__"

preproc_ifdef

#ifdef "#ifdef"

identifier "_WIN64"

type_definition

typedef "typedef"

type_identifier "__int64"

primitive_type "ssize_t"

; ";"

preproc_else

#else "#else"

type_definition

typedef "typedef"

primitive_type "int"

primitive_type "ssize_t"

; ";"

#endif "#endif"

type_definition

typedef "typedef"

primitive_type "uint32_t"

type_identifier "in_addr_t"

; ";"

type_definition

typedef "typedef"

type_identifier "u_short"

type_identifier "in_port_t"

; ";"

type_definition

typedef "typedef"

primitive_type "int"

type_identifier "sig_atomic_t"

; ";"

preproc_ifdef (+54 nodes collapsed)

preproc_def

#define "#define"

identifier "NGX_OFF_T_LEN"

preproc_arg "(sizeof(\"-9223372036854775807\") - 1)"

preproc_def

#define "#define"

identifier "NGX_MAX_OFF_T_VALUE"

preproc_arg "9223372036854775807"

preproc_def

#define "#define"

identifier "NGX_SIG_ATOMIC_T_SIZE"

preproc_arg "4"

preproc_def

#define "#define"

identifier "NGX_HAVE_LITTLE_ENDIAN"

preproc_arg "1"

preproc_def

#define "#define"

identifier "NGX_HAVE_NONALIGNED"

preproc_arg "1"

preproc_def

#define "#define"

identifier "NGX_WIN_NT"

preproc_arg "200000"

preproc_def

#define "#define"

identifier "NGX_LISTEN_BACKLOG"

preproc_arg "511"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_INHERITED_NONBLOCK"

preproc_def

#define "#define"

identifier "NGX_HAVE_INHERITED_NONBLOCK"

preproc_arg "1"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_CASELESS_FILESYSTEM"

preproc_def

#define "#define"

identifier "NGX_HAVE_CASELESS_FILESYSTEM"

preproc_arg "1"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_WIN32_TRANSMITPACKETS"

preproc_def

#define "#define"

identifier "NGX_HAVE_WIN32_TRANSMITPACKETS"

preproc_arg "1"

preproc_def

#define "#define"

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

preproc_arg "0"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

preproc_def

#define "#define"

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

preproc_arg "1"

#endif "#endif"

preproc_if

#if "#if"

binary_expression

parenthesized_expression

( "("

identifier "NGX_HAVE_WIN32_TRANSMITPACKETS"

) ")"

|| "||"

parenthesized_expression

( "("

identifier "NGX_HAVE_WIN32_TRANSMITFILE"

) ")"

"\n"

preproc_def

#define "#define"

identifier "NGX_HAVE_SENDFILE"

preproc_arg "1"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_SO_SNDLOWAT"

comment "/* setsockopt(SO_SNDLOWAT) returns error WSAENOPROTOOPT */"

preproc_def

#define "#define"

identifier "NGX_HAVE_SO_SNDLOWAT"

preproc_arg "0"

#endif "#endif"

preproc_ifdef

#ifndef "#ifndef"

identifier "NGX_HAVE_FIONREAD"

preproc_def

#define "#define"

identifier "NGX_HAVE_FIONREAD"

preproc_arg "1"

#endif "#endif"

preproc_def

#define "#define"

identifier "NGX_HAVE_GETADDRINFO"

preproc_arg "1"

preproc_def

#define "#define"

identifier "ngx_random"

preproc_arg "rand"

preproc_function_def

#define "#define"

identifier "ngx_debug_init"

preproc_params

( "("

) ")"

#endif "#endif"

comment "/* _NGX_WIN32_CONFIG_H_INCLUDED_ */"