git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] Change include order in two compat/ files to avoid compiler warning

From
Ben Walton <bwalton@artsci.utoronto.ca>
Date
Feb 5, 2012, 01:08 UTC
Message-ID
<1328404107-15757-1-git-send-email-bwalton@artsci.utoronto.ca>

The inet_ntop and inet_pton compatibility wrapper source files included system headers before git-compat-utils.h. This was causing a warning on Solaris as _FILE_OFFSET_BITS was being redefined in git-compat-utils.h. Including git-compat-utils.h first avoids the warnings.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
---

I verified that this re-ordering doesn't affect either the build or the test suite completion on both i386 and sparc. I think the ordering is simply the result of placing the git-compat-utils.h include where some others were removed in da523cc597b1.

 compat/inet_ntop.c |    4 +---
 compat/inet_pton.c |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c
index 60b5a1d..f1bf81c 100644
--- a/compat/inet_ntop.c
+++ b/compat/inet_ntop.c
@@ -15,11 +15,9 @@
  * SOFTWARE.
  */
 
+#include "../git-compat-util.h"
 #include <errno.h>
 #include <sys/types.h>
-
-#include "../git-compat-util.h"
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/compat/inet_pton.c b/compat/inet_pton.c
index 2ec995e..1d44a5d 100644
--- a/compat/inet_pton.c
+++ b/compat/inet_pton.c
@@ -15,11 +15,9 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "../git-compat-util.h"
 #include <errno.h>
 #include <sys/types.h>
-
-#include "../git-compat-util.h"
-
 #include <stdio.h>
 #include <string.h>
 
-- 
1.7.8.3
Next: Junio C Hamano
Message 1 of 4 in “Change include order in two compat/ files to avoid compiler warning”
  1. Change include order in two compat/ files to avoid compiler warningBen Walton, Feb 5, 2012
  2. Junio C HamanoFeb 5, 2012
  3. (unknown)Ben Walton, Feb 5, 2012
  4. Drop system includes from inet_pton/inet_ntop compatibility wrappersBen Walton, Feb 5, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.