diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-23 15:12:35 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-23 15:12:35 +0200 |
| commit | 53d491c9a4011a7d9ad69db52fb91d163f3f990a (patch) | |
| tree | 9d0ed3130f35142da50c2e20e8addfe8909f459f /lib/replace | |
| parent | af6298a84dffb400551861c6dc34591f1473830c (diff) | |
| parent | 1722859abd169f2949b5822f97c810f2b8d162da (diff) | |
| download | samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.gz samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.xz samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/libreplace_cc.m4 | 4 | ||||
| -rw-r--r-- | lib/replace/replace.h | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/replace/libreplace_cc.m4 b/lib/replace/libreplace_cc.m4 index 30c63f2f058..a26dee498e9 100644 --- a/lib/replace/libreplace_cc.m4 +++ b/lib/replace/libreplace_cc.m4 @@ -141,9 +141,7 @@ AC_CHECK_SIZEOF(off_t) AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(ssize_t) -AC_CHECK_TYPE(intptr_t, long long) -AC_CHECK_TYPE(uintptr_t, unsigned long long) -AC_CHECK_TYPE(ptrdiff_t, unsigned long long) +AC_CHECK_TYPES([intptr_t, uintptr_t, ptrdiff_t]) if test x"$ac_cv_type_long_long" != x"yes";then AC_MSG_ERROR([LIBREPLACE needs type 'long long']) diff --git a/lib/replace/replace.h b/lib/replace/replace.h index c5b8676acfa..fe1f732acb2 100644 --- a/lib/replace/replace.h +++ b/lib/replace/replace.h @@ -535,6 +535,18 @@ typedef int bool; #endif #endif +#if !defined(HAVE_INTPTR_T) +typedef long long intptr_t ; +#endif + +#if !defined(HAVE_UINTPTR_T) +typedef unsigned long long uintptr_t ; +#endif + +#if !defined(HAVE_PTRDIFF_T) +typedef unsigned long long ptrdiff_t ; +#endif + /* * to prevent <rpcsvc/yp_prot.h> from doing a redefine of 'bool' * |