From daff4006627fc88be85dade3d72aa45e57a6804a Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Tue, 5 Jan 2010 00:14:06 +0000 Subject: [PATCH] Fixes for supergroups on Darwin 64bit Some fixes needed to make supergroups build on 64bit Mac OS 10.5 Change-Id: I1aea100b138a8212010dd9f511377c993589977f Reviewed-on: http://gerrit.openafs.org/1060 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/ptserver/map.c | 6 +----- src/ptserver/ptserver.c | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/ptserver/map.c b/src/ptserver/map.c index eb06194e67..c58c258c9d 100644 --- a/src/ptserver/map.c +++ b/src/ptserver/map.c @@ -35,12 +35,8 @@ #ifdef SUPERGROUPS #include #include -#include "map.h" -#ifdef STDLIB_HAS_MALLOC_PROTOS #include -#else -#include "malloc.h" -#endif +#include "map.h" #undef PRINT_MAP_ERROR /* #define MAP_DEBUG */ diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 803a0d2718..f347ec567f 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -262,7 +262,8 @@ main(int argc, char **argv) || (sizeof(struct prentryg) != ENTRYSIZE)) { fprintf(stderr, "The structures for the database records are different" - " sizes\n" "struct prentry = %d\n" "struct prentryg = %d\n" + " sizes\n" "struct prentry = %" AFS_SIZET_FMT "\n" + "struct prentryg = %" AFS_SIZET_FMT "\n" "ENTRYSIZE = %d\n", sizeof(struct prentry), sizeof(struct prentryg), ENTRYSIZE); PT_EXIT(1);