Can we include "includes" a little later?

[Andrew Bartlett]

On Fri, 2012-12-07 at 09:09 -0800, Richard Sharpe wrote:
> Hi folks,
> 
> In our build there are lots of instances of these warnings:
> 
> /home/rsharpe/dev-src/buildroot/tools/x86_gcc4.2.4/usr/include/machine/_inttypes.h:67:1:
> warning: "PRIi64" redefined
> In file included from include/includes.h:23,
>                  from libnet/libnet_dssync_keytab.c:21:
> ./../lib/replace/../replace/replace.h:91:1: warning: this is the
> location of the previous definition
> In file included from
> /home/rsharpe/dev-src/buildroot/tools/x86_gcc4.2.4/usr/include/inttypes.h:32,
>                  from
> /home/rsharpe/dev-src/buildroot/tools/x86_gcc4.2.4/usr/include/krb5-types.h:9,
>                  from
> /home/rsharpe/dev-src/buildroot/tools/x86_gcc4.2.4/usr/include/krb5.h:40,
>                  from include/smb_krb5.h:36,
>                  from libnet/libnet_dssync_keytab.c:22:
> 
> These come about because we include includes.h before smb_krb5.conf in
> source3/libnet/libnet_dssync_keytab.c:
> 
> #include "includes.h"
> #include "smb_krb5.h"
> #include "ads.h"
> #include "libnet/libnet_dssync.h"
> #include "libnet/libnet_keytab.h"
> #include "librpc/gen_ndr/ndr_drsblobs.h"
> 
> includes.h pulls in replace.h which defines all those PRIxxx things
> before the system includes that get pulled in by smb_krb5.h.
> 
> It sure would remove a lot of useless noise warnings if we changed the
> order of includes ...

No, it would just cause other problems.

If the current includes.h cause problems, we need to do one of two
things:
 - Include less in "includes.h" (something we have been trying to do for
a time)
 - Fix the re-definition.

In this case, as we always include replace.h early, it needs to include
any headers required to correctly (rather than by replacement) define
things like PRIi64.  And indeed it does:

#ifdef HAVE_STDINT_H
#include <stdint.h>
/* force off HAVE_INTTYPES_H so that roken doesn't try to include both,
   which causes a warning storm on irix */
#undef HAVE_INTTYPES_H
#elif HAVE_INTTYPES_H
#define __STDC_FORMAT_MACROS
#include <inttypes.h>
#endif

So, what you really need to do is work out why this #ifdef block is not
correct, stdint.h doesn't define these, or why you don't have inttypes.h
at configure time.

Andrew Bartlett

-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org