[PATCH] Drop prefixes from replacements in VMS config.h.
"Craig A. Berry" <[email protected]>
| Newsgroups | gmane.comp.db.tds.freetds |
|---|---|
| Message-ID | <[email protected]> |
[Inline and attached] These conflict with the inline prefixes now in use. We keep our own prefixes for routines defined in vms/ rather than in src/replacements. --- vms/config_h.vms | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/vms/config_h.vms b/vms/config_h.vms index 1f731d2..8da6c11 100644 --- a/vms/config_h.vms +++ b/vms/config_h.vms @@ -337,27 +337,6 @@ #pragma extern_prefix "freetds_" (getpass) char *getpass( const char* prompt ); -#if !HAVE_ASPRINTF -#pragma extern_prefix "freetds_" (asprintf) -#endif /* !HAVE_ASPRINTF */ - -#if !HAVE_VASPRINTF -#pragma extern_prefix "freetds_" (vasprintf) -#endif /* !HAVE_VASPRINTF */ - -#if !HAVE_SNPRINTF -#pragma extern_prefix "portable_" (snprintf) -extern int snprintf(char *, size_t, const char *, /*args*/ ...); -#endif /* !HAVE_SNPRINTF */ - -#if !HAVE_STRTOK_R -#pragma extern_prefix "freetds_" (strtok_r) -#endif /* !HAVE_STRTOK_R */ - -#pragma extern_prefix restore - -#define tds_sysdep_intptr_type int /* 32-bit int */ - #pragma extern_prefix "freetds_" (readpassphrase) char * readpassphrase(const char *, char *, size_t, int); #ifdef HAVE_READPASSPHRASE @@ -365,6 +344,11 @@ char * readpassphrase(const char *, char *, size_t, int); # undef HAVE_READPASSPHRASE #endif +#pragma extern_prefix restore + +#define tds_sysdep_intptr_type int /* 32-bit int */ + + #include "replacements.h" /* If the CRTL ever complies with UNIX98 and defines socklen_t in — 2.2.1 ________________________________________ Craig A. Berry mailto:[email protected] "... getting out of a sonnet is much more difficult than getting in." Brad Leithauser _______________________________________________ FreeTDS mailing list [email protected] http://lists.ibiblio.org/mailman/listinfo/freetds
0001-Drop-prefixes-from-replacements-in-VMS-config.h.patch
(application/octet-stream, 1.7 KB)
From 37dede1fdd6034a3cc72d4e6beddea88d5484560 Mon Sep 17 00:00:00 2001 From: "Craig A. Berry" <[email protected]> Date: Thu, 27 Aug 2015 14:53:11 -0500 Subject: [PATCH 1/3] Drop prefixes from replacements in VMS config.h. These conflict with the inline prefixes now in use. We keep our own prefixes for routines defined in vms/ rather than in src/replacements. --- vms/config_h.vms | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/vms/config_h.vms b/vms/config_h.vms index 1f731d2..8da6c11 100644 --- a/vms/config_h.vms +++ b/vms/config_h.vms @@ -337,27 +337,6 @@ #pragma extern_prefix "freetds_" (getpass) char *getpass( const char* prompt ); -#if !HAVE_ASPRINTF -#pragma extern_prefix "freetds_" (asprintf) -#endif /* !HAVE_ASPRINTF */ - -#if !HAVE_VASPRINTF -#pragma extern_prefix "freetds_" (vasprintf) -#endif /* !HAVE_VASPRINTF */ - -#if !HAVE_SNPRINTF -#pragma extern_prefix "portable_" (snprintf) -extern int snprintf(char *, size_t, const char *, /*args*/ ...); -#endif /* !HAVE_SNPRINTF */ - -#if !HAVE_STRTOK_R -#pragma extern_prefix "freetds_" (strtok_r) -#endif /* !HAVE_STRTOK_R */ - -#pragma extern_prefix restore - -#define tds_sysdep_intptr_type int /* 32-bit int */ - #pragma extern_prefix "freetds_" (readpassphrase) char * readpassphrase(const char *, char *, size_t, int); #ifdef HAVE_READPASSPHRASE @@ -365,6 +344,11 @@ char * readpassphrase(const char *, char *, size_t, int); # undef HAVE_READPASSPHRASE #endif +#pragma extern_prefix restore + +#define tds_sysdep_intptr_type int /* 32-bit int */ + + #include "replacements.h" /* If the CRTL ever complies with UNIX98 and defines socklen_t in -- 2.2.1