Re: [PATCH] Don't disable system's readpassphrase.h.
Frediano Ziglio <[email protected]>
| Newsgroups | gmane.comp.db.tds.freetds |
|---|---|
| Message-ID | <CAHt6W4dnHGK+2O8=pPGk1VGiYi9gcD_jopGJB9ynbDQP5FVUJw@mail.gmail.com> |
Il 29/Ago/2015 02:42, "Craig A. Berry" <[email protected]> ha scritto: > > We were defining _READPASSPHRASE_H_ in our replacement version, > and then, when HAVE_READPASSPHRASE was defined, including the > system version of readpassphrase.h. At least on BSD-like systems, > the contents of that file are skipped when _READPASSPHRASE_H_ is > already defined. So use our own macro to guard our own header > rather stealing the guard macro that is also used by the system. > --- > include/replacements/readpassphrase.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/replacements/readpassphrase.h b/include/replacements/readpassphrase.h > index db6312f..bba3190 100644 > --- a/include/replacements/readpassphrase.h > +++ b/include/replacements/readpassphrase.h > @@ -29,8 +29,8 @@ > * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > */ > > -#ifndef _READPASSPHRASE_H_ > -#define _READPASSPHRASE_H_ > +#ifndef _FREETDS_READPASSPHRASE_H_ > +#define _FREETDS_READPASSPHRASE_H_ > > #ifdef HAVE_READPASSPHRASE > > — > 2.2.1 Looks like this patch is very similar to mine Frediano _______________________________________________ FreeTDS mailing list [email protected] http://lists.ibiblio.org/mailman/listinfo/freetds