From 259f27b09fcbe1440a00f3024ecdf4c43e218642 Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Wed, 8 Aug 2007 10:37:07 +0000 Subject: [PATCH] Fix getsockname argument type Improve "universal" alignment type in struct memdebug --- lib/krb5.c | 2 +- lib/memdebug.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/krb5.c b/lib/krb5.c index 989bc49..b2c04a9 100644 --- a/lib/krb5.c +++ b/lib/krb5.c @@ -155,7 +155,7 @@ krb5_auth(void *app_data, struct connectdata *conn) char *p; const char *host = conn->dns_entry->addr->ai_canonname; ssize_t nread; - unsigned int l = sizeof(conn->local_addr); + socklen_t l = sizeof(conn->local_addr); struct SessionHandle *data = conn->data; CURLcode result; const char *service = "ftp", *srv_host = "host"; diff --git a/lib/memdebug.c b/lib/memdebug.c index 2eb4c5a..9d3ef3d 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -47,7 +47,10 @@ struct memdebug { size_t size; - double mem[1]; + union { + double d; + void * p; + } mem[1]; /* I'm hoping this is the thing with the strictest alignment * requirements. That also means we waste some space :-( */ }; -- 2.7.4