| defs.h | defs.h | |||
|---|---|---|---|---|
| #ifndef _LIBHX_DEFS_H | #ifndef _LIBHX_DEFS_H | |||
| #define _LIBHX_DEFS_H 1 | #define _LIBHX_DEFS_H 1 | |||
| #ifdef __cplusplus | #ifdef __cplusplus | |||
| # define HXsizeof_member(type, member) \ | # define FIELD_SIZEOF(type, member) \ | |||
| sizeof(static_cast<type *>(NULL)->member) | sizeof(static_cast<type *>(NULL)->member) | |||
| # define HXsizeof_member(type, member) FIELD_SIZEOF(type, member) | ||||
| # define HXtypeof_member(type, member) \ | # define HXtypeof_member(type, member) \ | |||
| __typeof__(static_cast<type *>(NULL)->member) | __typeof__(static_cast<type *>(NULL)->member) | |||
| # if defined(__GNUC__) && __GNUC__ >= 4 && !defined(offsetof) | # if defined(__GNUC__) && __GNUC__ >= 4 && !defined(offsetof) | |||
| /* | /* | |||
| * This is here so most programs can skip inclusion | * This is here so most programs can skip inclusion | |||
| * of stddef.h just to get offsetof. | * of stddef.h just to get offsetof. | |||
| */ | */ | |||
| # define offsetof(type, member) __builtin_offsetof(type, membe r) | # define offsetof(type, member) __builtin_offsetof(type, membe r) | |||
| # endif | # endif | |||
| # ifndef offsetof | # ifndef offsetof | |||
| End of changes. 2 change blocks. | ||||
| 1 lines changed or deleted | 2 lines changed or added | |||
| string.h | string.h | |||
|---|---|---|---|---|
| skipping to change at line 28 | skipping to change at line 28 | |||
| extern "C" { | extern "C" { | |||
| #endif | #endif | |||
| enum { | enum { | |||
| HXQUOTE_SQUOTE = 1, | HXQUOTE_SQUOTE = 1, | |||
| HXQUOTE_DQUOTE, | HXQUOTE_DQUOTE, | |||
| HXQUOTE_HTML, | HXQUOTE_HTML, | |||
| HXQUOTE_LDAPFLT, | HXQUOTE_LDAPFLT, | |||
| HXQUOTE_LDAPRDN, | HXQUOTE_LDAPRDN, | |||
| HXQUOTE_BASE64, | HXQUOTE_BASE64, | |||
| HXQUOTE_URIENC, | ||||
| _HXQUOTE_MAX, | _HXQUOTE_MAX, | |||
| }; | }; | |||
| #ifndef __libhx_internal_hxmc_t_defined | #ifndef __libhx_internal_hxmc_t_defined | |||
| #define __libhx_internal_hxmc_t_defined 1 | #define __libhx_internal_hxmc_t_defined 1 | |||
| typedef char hxmc_t; | typedef char hxmc_t; | |||
| #endif | #endif | |||
| /* | /* | |||
| * MC.C | * MC.C | |||
| skipping to change at line 69 | skipping to change at line 70 | |||
| extern char *HX_basename(const char *); | extern char *HX_basename(const char *); | |||
| extern char *HX_basename_exact(const char *); | extern char *HX_basename_exact(const char *); | |||
| extern char *HX_chomp(char *); | extern char *HX_chomp(char *); | |||
| extern char *HX_dirname(const char *); | extern char *HX_dirname(const char *); | |||
| extern hxmc_t *HX_getl(hxmc_t **, FILE *); | extern hxmc_t *HX_getl(hxmc_t **, FILE *); | |||
| extern void *HX_memmem(const void *, size_t, const void *, size_t); | extern void *HX_memmem(const void *, size_t, const void *, size_t); | |||
| extern char **HX_split(const char *, const char *, int *, int); | extern char **HX_split(const char *, const char *, int *, int); | |||
| extern char **HX_split4(char *, const char *, int *, int); | extern char **HX_split4(char *, const char *, int *, int); | |||
| extern int HX_split5(char *, const char *, int, char **); | extern int HX_split5(char *, const char *, int, char **); | |||
| extern char *HX_strbchr(const char *, const char *, char); | extern char *HX_strbchr(const char *, const char *, char); | |||
| extern char *HX_strchr2(const char *, const char *); | ||||
| extern char *HX_strclone(char **, const char *); | extern char *HX_strclone(char **, const char *); | |||
| extern char *HX_strdup(const char *); | extern char *HX_strdup(const char *); | |||
| extern char *HX_strlcat(char *, const char *, size_t); | extern char *HX_strlcat(char *, const char *, size_t); | |||
| extern char *HX_strlcpy(char *, const char *, size_t); | extern char *HX_strlcpy(char *, const char *, size_t); | |||
| extern char *HX_strlncat(char *, const char *, size_t, size_t); | extern char *HX_strlncat(char *, const char *, size_t, size_t); | |||
| extern char *HX_strlower(char *); | extern char *HX_strlower(char *); | |||
| extern size_t HX_strltrim(char *); | extern size_t HX_strltrim(char *); | |||
| extern char *HX_strmid(const char *, long, long); | extern char *HX_strmid(const char *, long, long); | |||
| extern char *HX_strndup(const char *, size_t); | extern char *HX_strndup(const char *, size_t); | |||
| extern size_t HX_strnlen(const char *, size_t); | extern size_t HX_strnlen(const char *, size_t); | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 2 lines changed or added | |||