With Metze's fix to pidl and my latest patch for uint64 we can get rid of some ugly defines

[Michael Adam]

Hi Richard,

this looks nice! :)

I will consider/review it later tonight (if no-one else has).
Dinner time now.

Would you mind re-sending this patch in a git-format form?

Cheers - Michael

On 2015-05-15 at 08:20 -0700, Richard Sharpe wrote:
> Hi folks,
> 
> Samba now builds with the following change:
> 
> diff --git a/source3/include/includes.h b/source3/include/includes.h
> index 0c3a9ee..a050d87 100644
> --- a/source3/include/includes.h
> +++ b/source3/include/includes.h
> @@ -185,12 +185,7 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
>     as signed and unsigned int will work.
>  */
> 
> -#ifndef uint8
> -#  define uint8 uint8_t
> -#endif
> -
>  #if !defined(int16) && !defined(HAVE_INT16_FROM_RPC_RPC_H)
> -#  define int16 int16_t
>     /* needed to work around compile issue on HP-UX 11.x */
>  #  define _INT16       1
>  #endif
> @@ -200,11 +195,6 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
>   * case as int16 may be a typedef from rpc/rpc.h
>   */
> 
> -
> -#if !defined(uint16) && !defined(HAVE_UINT16_FROM_RPC_RPC_H)
> -#  define uint16 uint16_t
> -#endif
> -
>  #if !defined(int32) && !defined(HAVE_INT32_FROM_RPC_RPC_H)
>  #  define int32 int32_t
>  #  ifndef _INT32
> @@ -214,28 +204,6 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T;
>  #endif
> 
>  /*
> - * Note we duplicate the size tests in the unsigned
> - * case as int32 may be a typedef from rpc/rpc.h
> - */
> -
> -#if !defined(uint32) && !defined(HAVE_UINT32_FROM_RPC_RPC_H)
> -#  define uint32 uint32_t
> -#endif
> -
> -/*
> - * check for 8 byte long long
> - */
> -
> -#if !defined(uint64)
> -#  define uint64 uint64_t
> -#endif
> -
> -#if !defined(int64)
> -#  define int64 int64_t
> -#endif
> -
> -
> -/*
>   * Types for devices, inodes and offsets.
>   */
> 
> 
> -- 
> Regards,
> Richard Sharpe
> (何以解憂？唯有杜康。--曹操)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20150515/10b9962e/attachment.pgp>