Uri.h   Uri.h 
skipping to change at line 53 skipping to change at line 53
* NOTE: This header includes itself twice. * NOTE: This header includes itself twice.
*/ */
#if (defined(URI_PASS_ANSI) && !defined(URI_H_ANSI)) \ #if (defined(URI_PASS_ANSI) && !defined(URI_H_ANSI)) \
|| (defined(URI_PASS_UNICODE) && !defined(URI_H_UNICODE)) \ || (defined(URI_PASS_UNICODE) && !defined(URI_H_UNICODE)) \
|| (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE)) || (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE))
/* What encodings are enabled? */ /* What encodings are enabled? */
#include "UriDefsConfig.h" #include "UriDefsConfig.h"
#if (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE)) #if (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE))
/* Include SELF twice */ /* Include SELF twice */
# define URI_PASS_ANSI 1 # ifdef URI_ENABLE_ANSI
# include "Uri.h" # define URI_PASS_ANSI 1
# undef URI_PASS_ANSI # include "Uri.h"
# define URI_PASS_UNICODE 1 # undef URI_PASS_ANSI
# include "Uri.h" # endif
# undef URI_PASS_UNICODE # ifdef URI_ENABLE_UNICODE
# define URI_PASS_UNICODE 1
# include "Uri.h"
# undef URI_PASS_UNICODE
# endif
/* Only one pass for each encoding */ /* Only one pass for each encoding */
#elif (defined(URI_PASS_ANSI) && !defined(URI_H_ANSI) \ #elif (defined(URI_PASS_ANSI) && !defined(URI_H_ANSI) \
&& defined(URI_ENABLE_ANSI)) || (defined(URI_PASS_UNICODE) \ && defined(URI_ENABLE_ANSI)) || (defined(URI_PASS_UNICODE) \
&& !defined(URI_H_UNICODE) && defined(URI_ENABLE_UNICODE)) && !defined(URI_H_UNICODE) && defined(URI_ENABLE_UNICODE))
# ifdef URI_PASS_ANSI # ifdef URI_PASS_ANSI
# define URI_H_ANSI 1 # define URI_H_ANSI 1
# include "UriDefsAnsi.h" # include "UriDefsAnsi.h"
# else # else
# define URI_H_UNICODE 1 # define URI_H_UNICODE 1
# include "UriDefsUnicode.h" # include "UriDefsUnicode.h"
skipping to change at line 248 skipping to change at line 252
*/ */
URI_CHAR * URI_FUNC(EscapeEx)(const URI_CHAR * inFirst, URI_CHAR * URI_FUNC(EscapeEx)(const URI_CHAR * inFirst,
const URI_CHAR * inAfterLast, URI_CHAR * out, const URI_CHAR * inAfterLast, URI_CHAR * out,
UriBool spaceToPlus, UriBool normalizeBreaks); UriBool spaceToPlus, UriBool normalizeBreaks);
/** /**
* Percent-encodes all unreserved characters from the input string and * Percent-encodes all unreserved characters from the input string and
* writes the encoded version to the output string. * writes the encoded version to the output string.
* Be sure to allocate <b>3 times</b> the space of the input buffer for * Be sure to allocate <b>3 times</b> the space of the input buffer for
* the output buffer for <c>normalizeBreaks == URI_FALSE</c> and <b>6 times </b> * the output buffer for <c>normalizeBreaks == URI_FALSE</c> and <b>6 times </b>
* the space for <c>normalizeBreaks == URI_FALSE</c> * the space for <c>normalizeBreaks == URI_TRUE</c>
* (since e.g. "\x0d" becomes "%0D%0A" in that case) * (since e.g. "\x0d" becomes "%0D%0A" in that case)
* *
* @param in <b>IN</b>: Text source * @param in <b>IN</b>: Text source
* @param out <b>OUT</b>: Encoded text destination * @param out <b>OUT</b>: Encoded text destination
* @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not * @param spaceToPlus <b>IN</b>: Wether to convert ' ' to '+' or not
* @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not. * @param normalizeBreaks <b>IN</b>: Wether to convert CR and LF to CR-LF or not.
* @return Position of terminator in output string * @return Position of terminator in output string
* *
* @see uriEscapeExA * @see uriEscapeExA
* @see uriUnescapeInPlaceA * @see uriUnescapeInPlaceA
 End of changes. 2 change blocks. 
7 lines changed or deleted 11 lines changed or added


 UriBase.h   UriBase.h 
skipping to change at line 54 skipping to change at line 54
#ifndef URI_BASE_H #ifndef URI_BASE_H
#define URI_BASE_H 1 #define URI_BASE_H 1
/* Version helper macro */ /* Version helper macro */
#define URI_ANSI_TO_UNICODE(x) L##x #define URI_ANSI_TO_UNICODE(x) L##x
/* Version */ /* Version */
#define URI_VER_MAJOR 0 #define URI_VER_MAJOR 0
#define URI_VER_MINOR 7 #define URI_VER_MINOR 7
#define URI_VER_RELEASE 5 #define URI_VER_RELEASE 6
#define URI_VER_SUFFIX_ANSI "" #define URI_VER_SUFFIX_ANSI ""
#define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI) #define URI_VER_SUFFIX_UNICODE URI_ANSI_TO_UNICODE(URI_VER_SUFFIX_ANSI)
/* More version helper macros */ /* More version helper macros */
#define URI_INT_TO_ANSI_HELPER(x) #x #define URI_INT_TO_ANSI_HELPER(x) #x
#define URI_INT_TO_ANSI(x) URI_INT_TO_ANSI_HELPER(x) #define URI_INT_TO_ANSI(x) URI_INT_TO_ANSI_HELPER(x)
#define URI_INT_TO_UNICODE_HELPER(x) URI_ANSI_TO_UNICODE(#x) #define URI_INT_TO_UNICODE_HELPER(x) URI_ANSI_TO_UNICODE(#x)
#define URI_INT_TO_UNICODE(x) URI_INT_TO_UNICODE_HELPER(x) #define URI_INT_TO_UNICODE(x) URI_INT_TO_UNICODE_HELPER(x)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 UriDefsConfig.h   UriDefsConfig.h 
skipping to change at line 59 skipping to change at line 59
#undef URI_ENABLE_ANSI /* Internal for !URI_NO_ANSI */ #undef URI_ENABLE_ANSI /* Internal for !URI_NO_ANSI */
#undef URI_ENABLE_UNICODE /* Internal for !URI_NO_UNICODE */ #undef URI_ENABLE_UNICODE /* Internal for !URI_NO_UNICODE */
/* Encoding */ /* Encoding */
#ifdef URI_NO_ANSI #ifdef URI_NO_ANSI
# ifdef URI_NO_UNICODE # ifdef URI_NO_UNICODE
/* No encoding at all */ /* No encoding at all */
# error URI_NO_ANSI and URI_NO_UNICODE cannot go together. # error URI_NO_ANSI and URI_NO_UNICODE cannot go together.
# else # else
/* Unicode only */ /* Unicode only */
# define URI_ENABLE_UNICODE 1 # define URI_ENABLE_UNICODE 1
# endif # endif
#else #else
# ifdef URI_NO_UNICODE # ifdef URI_NO_UNICODE
/* ANSI only */ /* ANSI only */
# define URI_ENABLE_ANSI 1 # define URI_ENABLE_ANSI 1
# else # else
/* Both ANSI and Unicode */ /* Both ANSI and Unicode */
# define URI_ENABLE_ANSI 1 # define URI_ENABLE_ANSI 1
# define URI_ENABLE_UNICODE 1 # define URI_ENABLE_UNICODE 1
# endif # endif
#endif #endif
/* Function inlining, not ANSI/ISO C! */ /* Function inlining, not ANSI/ISO C! */
#if (defined(URI_DOXYGEN) || defined(URI_SIZEDOWN)) #if (defined(URI_DOXYGEN) || defined(URI_SIZEDOWN))
# define URI_INLINE # define URI_INLINE
#elif defined(__INTEL_COMPILER) #elif defined(__INTEL_COMPILER)
/* Intel C/C++ */ /* Intel C/C++ */
/* http://predef.sourceforge.net/precomp.html#sec20 */ /* http://predef.sourceforge.net/precomp.html#sec20 */
/* http://www.intel.com/support/performancetools/c/windows/sb/CS-007751.htm #2 */ /* http://www.intel.com/support/performancetools/c/windows/sb/CS-007751.htm #2 */
 End of changes. 3 change blocks. 
4 lines changed or deleted 4 lines changed or added


 UriIp4.h   UriIp4.h 
skipping to change at line 53 skipping to change at line 53
* NOTE: This header includes itself twice. * NOTE: This header includes itself twice.
*/ */
#if (defined(URI_PASS_ANSI) && !defined(URI_IP4_TWICE_H_ANSI)) \ #if (defined(URI_PASS_ANSI) && !defined(URI_IP4_TWICE_H_ANSI)) \
|| (defined(URI_PASS_UNICODE) && !defined(URI_IP4_TWICE_H_UNICODE)) \ || (defined(URI_PASS_UNICODE) && !defined(URI_IP4_TWICE_H_UNICODE)) \
|| (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE)) || (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE))
/* What encodings are enabled? */ /* What encodings are enabled? */
#include "UriDefsConfig.h" #include "UriDefsConfig.h"
#if (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE)) #if (!defined(URI_PASS_ANSI) && !defined(URI_PASS_UNICODE))
/* Include SELF twice */ /* Include SELF twice */
# define URI_PASS_ANSI 1 # ifdef URI_ENABLE_ANSI
# include "UriIp4.h" # define URI_PASS_ANSI 1
# undef URI_PASS_ANSI # include "UriIp4.h"
# define URI_PASS_UNICODE 1 # undef URI_PASS_ANSI
# include "UriIp4.h" # endif
# undef URI_PASS_UNICODE # ifdef URI_ENABLE_UNICODE
# define URI_PASS_UNICODE 1
# include "UriIp4.h"
# undef URI_PASS_UNICODE
# endif
/* Only one pass for each encoding */ /* Only one pass for each encoding */
#elif (defined(URI_PASS_ANSI) && !defined(URI_IP4_TWICE_H_ANSI) \ #elif (defined(URI_PASS_ANSI) && !defined(URI_IP4_TWICE_H_ANSI) \
&& defined(URI_ENABLE_ANSI)) || (defined(URI_PASS_UNICODE) \ && defined(URI_ENABLE_ANSI)) || (defined(URI_PASS_UNICODE) \
&& !defined(URI_IP4_TWICE_H_UNICODE) && defined(URI_ENABLE_UNICODE)) && !defined(URI_IP4_TWICE_H_UNICODE) && defined(URI_ENABLE_UNICODE))
# ifdef URI_PASS_ANSI # ifdef URI_PASS_ANSI
# define URI_IP4_TWICE_H_ANSI 1 # define URI_IP4_TWICE_H_ANSI 1
# include "UriDefsAnsi.h" # include "UriDefsAnsi.h"
# else # else
# define URI_IP4_TWICE_H_UNICODE 1 # define URI_IP4_TWICE_H_UNICODE 1
# include "UriDefsUnicode.h" # include "UriDefsUnicode.h"
# include <wchar.h>
# endif # endif
/** /**
* Converts a IPv4 text representation into four bytes. * Converts a IPv4 text representation into four bytes.
* *
* @param octetOutput Output destination * @param octetOutput Output destination
* @param first First character of IPv4 text to parse * @param first First character of IPv4 text to parse
* @param afterLast Position to stop parsing at * @param afterLast Position to stop parsing at
* @return Error code or 0 on success * @return Error code or 0 on success
*/ */
 End of changes. 2 change blocks. 
6 lines changed or deleted 11 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/