diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-07-27 21:08:53 +0000 |
commit | 4386445c180179aa446a3f52b06f27c665169b97 (patch) | |
tree | 8a6985f406a9449148ffbddac844117b679bccc5 /apps/apps.h | |
parent | a585aa67507f8916f592e37b0fa8618e2bbbe08c (diff) |
Change STRING to OPENSSL_STRING etc as common words such
as "STRING" cause conflicts with other headers/libraries.
Diffstat (limited to 'apps/apps.h')
-rw-r--r-- | apps/apps.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/apps.h b/apps/apps.h index 4b0a0e1660..cdfb5efa5a 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -295,9 +295,9 @@ int save_index(const char *dbfile, const char *suffix, CA_DB *db); int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix); void free_index(CA_DB *db); #define index_name_cmp_noconst(a, b) \ - index_name_cmp((const CSTRING *)CHECKED_PTR_OF(STRING, a), \ - (const CSTRING *)CHECKED_PTR_OF(STRING, b)) -int index_name_cmp(const CSTRING *a, const CSTRING *b); + index_name_cmp((const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, a), \ + (const OPENSSL_CSTRING *)CHECKED_PTR_OF(OPENSSL_STRING, b)) +int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b); int parse_yesno(const char *str, int def); X509_NAME *parse_name(char *str, long chtype, int multirdn); |