Skip to Content.
Sympa Menu

freetds - [freetds] [PATCH] Don't disable system's readpassphrase.h.

freetds AT lists.ibiblio.org

Subject: FreeTDS Development Group

List archive

Chronological Thread  
  • From: "Craig A. Berry" <craigberry AT mac.com>
  • To: FreeTDS Development Group <freetds AT lists.ibiblio.org>
  • Subject: [freetds] [PATCH] Don't disable system's readpassphrase.h.
  • Date: Fri, 28 Aug 2015 08:16:50 -0500

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:craigberry AT mac.com

"... getting out of a sonnet is much more
difficult than getting in."
Brad Leithauser

Attachment: 0003-Don-t-disable-system-s-readpassphrase.h.patch
Description: Binary data




Archive powered by MHonArc 2.6.24.

Top of Page