* [PATCH] Change include order in two compat/ files to avoid compiler warning
@ 2012-02-05 1:08 Ben Walton
2012-02-05 20:41 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Ben Walton @ 2012-02-05 1:08 UTC (permalink / raw)
To: git, gitster; +Cc: Ben Walton
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Change include order in two compat/ files to avoid compiler warning
2012-02-05 1:08 [PATCH] Change include order in two compat/ files to avoid compiler warning Ben Walton
@ 2012-02-05 20:41 ` Junio C Hamano
2012-02-05 22:32 ` (unknown), Ben Walton
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2012-02-05 20:41 UTC (permalink / raw)
To: Ben Walton; +Cc: git
Ben Walton <bwalton@artsci.utoronto.ca> writes:
> The inet_ntop and inet_pton compatibility wrapper source files
> included system headers before git-compat-utils.h.
Thanks, that is definitely a breakage.
> 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>
I actually have to wonder if any of these four inclusion of the system headers
are warranted. Wouldn't they be included as part of git-compat-util.h anyway?
^ permalink raw reply [flat|nested] 4+ messages in thread
* (unknown),
2012-02-05 20:41 ` Junio C Hamano
@ 2012-02-05 22:32 ` Ben Walton
2012-02-05 22:32 ` [PATCH] Drop system includes from inet_pton/inet_ntop compatibility wrappers Ben Walton
0 siblings, 1 reply; 4+ messages in thread
From: Ben Walton @ 2012-02-05 22:32 UTC (permalink / raw)
To: git, gitster
Hi Junio,
> > 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>
>
> I actually have to wonder if any of these four inclusion of the
> system headers are warranted. Wouldn't they be included as part of
> git-compat-util.h anyway?
Yes, you're correct. Dropping the system includes is correct as
opposed to rearranging the order. Updated patch to follow.
Thanks
-Ben
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Drop system includes from inet_pton/inet_ntop compatibility wrappers
2012-02-05 22:32 ` (unknown), Ben Walton
@ 2012-02-05 22:32 ` Ben Walton
0 siblings, 0 replies; 4+ messages in thread
From: Ben Walton @ 2012-02-05 22:32 UTC (permalink / raw)
To: git, gitster; +Cc: Ben Walton
As both of these compatibility wrappers include git-compat-utils.h,
all of the system includes were redundant.
Dropping these system includes also makes git-compat-utils.h the first
include which avoids a compiler warning on Solaris due to the
redefinition of _FILE_OFFSET_BITS.
Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
---
compat/inet_ntop.c | 6 ------
compat/inet_pton.c | 6 ------
2 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/compat/inet_ntop.c b/compat/inet_ntop.c
index 60b5a1d..90b7cc4 100644
--- a/compat/inet_ntop.c
+++ b/compat/inet_ntop.c
@@ -15,14 +15,8 @@
* SOFTWARE.
*/
-#include <errno.h>
-#include <sys/types.h>
-
#include "../git-compat-util.h"
-#include <stdio.h>
-#include <string.h>
-
#ifndef NS_INADDRSZ
#define NS_INADDRSZ 4
#endif
diff --git a/compat/inet_pton.c b/compat/inet_pton.c
index 2ec995e..2b9a0a4 100644
--- a/compat/inet_pton.c
+++ b/compat/inet_pton.c
@@ -15,14 +15,8 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include <errno.h>
-#include <sys/types.h>
-
#include "../git-compat-util.h"
-#include <stdio.h>
-#include <string.h>
-
#ifndef NS_INT16SZ
#define NS_INT16SZ 2
#endif
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-02-05 22:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-05 1:08 [PATCH] Change include order in two compat/ files to avoid compiler warning Ben Walton
2012-02-05 20:41 ` Junio C Hamano
2012-02-05 22:32 ` (unknown), Ben Walton
2012-02-05 22:32 ` [PATCH] Drop system includes from inet_pton/inet_ntop compatibility wrappers Ben Walton
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).