[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28-45-gb620f7c

[Jeremy Allison]

On Mon, Dec 17, 2007 at 08:12:18PM +0000, simo wrote:
> 
> Jeremy,
> this patch is causing this:
> 
> Compiling param/loadparm.c
> In file included from ./lib/replace/system/network.h:85,
>                  from include/includes.h:108,
> 
> from /home/simo/devel/git/upstream/samba/source/dynconfig.c:21:
> /usr/include/stropts.h:67: error: conflicting types for ???swrap_ioctl???
> ./lib/socket_wrapper/socket_wrapper.h:50: error: previous declaration of
> ???swrap_ioctl??? was here
> In file included from ./lib/replace/system/network.h:85,
>                  from include/includes.h:108,
>                  from param/loadparm.c:54:
> /usr/include/stropts.h:67: error: conflicting types for ???swrap_ioctl???
> ./lib/socket_wrapper/socket_wrapper.h:50: error: previous declaration of
> ???swrap_ioctl??? was here
> 
> 
> I have reverted this locally and all builds correctly for me.

Fixed - include of stropts.h was after socket_wrapper.h
in the 3.0 push. It's now before.

Thanks,

Jeremy.