| UriBase.h | UriBase.h | |||
|---|---|---|---|---|
| skipping to change at line 54 | skipping to change at line 54 | |||
| #ifndef URI_INDEPENDENT_H | #ifndef URI_INDEPENDENT_H | |||
| #define URI_INDEPENDENT_H 1 | #define URI_INDEPENDENT_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 3 | #define URI_VER_MINOR 3 | |||
| #define URI_VER_RELEASE 0 | #define URI_VER_RELEASE 1 | |||
| #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) | |||
| skipping to change at line 103 | skipping to change at line 103 | |||
| /* Error codes */ | /* Error codes */ | |||
| #define URI_SUCCESS 0 | #define URI_SUCCESS 0 | |||
| #define URI_ERROR_SYNTAX 1 | #define URI_ERROR_SYNTAX 1 | |||
| #define URI_ERROR_NULL 2 /* One of the params passed was NULL although it mustn't be */ | #define URI_ERROR_NULL 2 /* One of the params passed was NULL although it mustn't be */ | |||
| #define URI_ERROR_MALLOC 3 /* Not used yet, TODO */ | #define URI_ERROR_MALLOC 3 /* Not used yet, TODO */ | |||
| #ifndef URI_DOXYGEN | #ifndef URI_DOXYGEN | |||
| # include <stdio.h> /* For NULL */ | # include <stdio.h> /* For NULL */ | |||
| # include <ctype.h> /* For wchar_t */ | # include <ctype.h> /* For wchar_t */ | |||
| # include <string.h> /* For strlen, memset, memcpy */ | # include <string.h> /* For strlen, memset, memcpy */ | |||
| # include <malloc.h> /* For malloc */ | # include <stdlib.h> /* For malloc */ | |||
| # if defined(__APPLE__) && defined(__MACH__) | ||||
| # include <malloc/malloc.h> /* For malloc, Mac OS X */ | ||||
| # else | ||||
| # include <malloc.h> /* For malloc */ | ||||
| # endif | ||||
| #endif /* URI_DOXYGEN */ | #endif /* URI_DOXYGEN */ | |||
| /** | /** | |||
| * Holds an IPv4 address. | * Holds an IPv4 address. | |||
| */ | */ | |||
| typedef struct UriIp4Struct { | typedef struct UriIp4Struct { | |||
| unsigned char data[4]; /**< Each octet in one byte */ | unsigned char data[4]; /**< Each octet in one byte */ | |||
| } UriIp4; | } UriIp4; | |||
| /** | /** | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 7 lines changed or added | |||