Fix getsockname argument type

Improve "universal" alignment type in struct memdebug

diff --git a/lib/krb5.c b/lib/krb5.c
index 989bc4959948ef7f178553d7db31d3b41a6060df..b2c04a9cbac96a7c4f20fcec4cd2a14740ff3aa4 100644 (file)
--- 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 2eb4c5afb90f374280d089bfa72c750f1e1b596a..9d3ef3d5ea2826d70691df211b0e5c2e2ecf5729 100644 (file)
--- 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 :-( */
 };