[PATCH] Don't disable system's readpassphrase.h.
"Craig A. Berry" <[email protected]>
| Newsgroups | gmane.comp.db.tds.freetds |
|---|---|
| Message-ID | <[email protected]> |
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 ________________________________________ 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
0003-Don-t-disable-system-s-readpassphrase.h.patch
(application/octet-stream, 1.1 KB)
From 69da9cb4a9f0d2a04606068e630fc6dca0cfdcb0 Mon Sep 17 00:00:00 2001 From: "Craig A. Berry" <[email protected]> Date: Fri, 28 Aug 2015 07:56:54 -0500 Subject: [PATCH 3/3] Don't disable system's readpassphrase.h. 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