linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
To: libtirpc-devel@lists.sourceforge.net
Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
	Steve Dickson <SteveD@redhat.com>,
	linux-nfs@vger.kernel.org
Subject: [PATCH v2 3/7] Make sure to include config.h
Date: Fri, 24 Apr 2015 02:27:38 +0200	[thread overview]
Message-ID: <1429835262-16861-4-git-send-email-rep.dot.nop@gmail.com> (raw)
In-Reply-To: <1429835262-16861-1-git-send-email-rep.dot.nop@gmail.com>

I really think the -DINET6 is wrong.

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
 src/Makefile.am | 4 ++--
 src/auth_time.c | 3 +++
 src/getrpcent.c | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 26ccbdf..38d0c3d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,8 @@
 
 noinst_HEADERS = rpc_com.h debug.h
 
-AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 \
-		-D_GNU_SOURCE -Wall -pipe  
+AM_CPPFLAGS = -I$(top_srcdir)/tirpc -include config.h -DPORTMAP -DINET6 \
+		-D_GNU_SOURCE -Wall -pipe
 
 lib_LTLIBRARIES = libtirpc.la
 
diff --git a/src/auth_time.c b/src/auth_time.c
index 13717ff..10e58eb 100644
--- a/src/auth_time.c
+++ b/src/auth_time.c
@@ -25,6 +25,9 @@
  *	needed to deal with TCP connections.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
diff --git a/src/getrpcent.c b/src/getrpcent.c
index fbb2da4..c374673 100644
--- a/src/getrpcent.c
+++ b/src/getrpcent.c
@@ -30,6 +30,10 @@
  * Copyright (c) 1984 by Sun Microsystems, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <netinet/in.h>
@@ -50,10 +54,6 @@
 #include <libc_private.h>
 #endif
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 /*
  * Internet version.
  */
-- 
2.1.4


  parent reply	other threads:[~2015-04-24  0:27 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-24  0:27 [PATCH v2 0/7] Rebase, resend Bernhard Reutner-Fischer
2015-04-24  0:27 ` [PATCH v2 1/7] delete src/config.h Bernhard Reutner-Fischer
2015-04-24  0:27 ` [PATCH v2 2/7] getrpcent: Fix compilation on glibc Bernhard Reutner-Fischer
2015-04-24  0:27 ` Bernhard Reutner-Fischer [this message]
2015-04-24  0:27 ` [PATCH v2 4/7] configure.ac: Allow for disabling NIS Bernhard Reutner-Fischer
2016-06-02 14:51   ` [Libtirpc-devel] " Chuck Lever
2015-04-24  0:27 ` [PATCH v2 5/7] configure.ac: Allow for disabling auth DES Bernhard Reutner-Fischer
2015-04-24  0:27 ` [PATCH v2 6/7] getrpcport: rephrase host lookup Bernhard Reutner-Fischer
2015-04-24  0:27 ` [PATCH v2 7/7] headers: if 0 out some unbuilt functions Bernhard Reutner-Fischer
2015-04-29 21:18 ` [Libtirpc-devel] [PATCH v2 0/7] Rebase, resend Steve Dickson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429835262-16861-4-git-send-email-rep.dot.nop@gmail.com \
    --to=rep.dot.nop@gmail.com \
    --cc=SteveD@redhat.com \
    --cc=libtirpc-devel@lists.sourceforge.net \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).