summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2018-02-26 11:33:44 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2018-02-26 11:33:44 +0900
commit6c736325c028647dc3283bf723e2e28199e7f45b (patch)
treed8b0c08c767259ff766a8e68925dd0e8a3630a74
parent35aad6b5d53b292e8e7c52c4eb90535be0580cd2 (diff)
downloadlibassuan-6c736325c028647dc3283bf723e2e28199e7f45b.tar.gz
Silence two minor warning on Windows.
* src/assuan-defs.h [HAVE_W64_SYSTEM] (SOCKET2HANDLE): Care for size of integer. * src/stpcpy.c: No K&R anymore. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
-rw-r--r--src/assuan-defs.h2
-rw-r--r--src/stpcpy.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/assuan-defs.h b/src/assuan-defs.h
index 6688198..e56d7b1 100644
--- a/src/assuan-defs.h
+++ b/src/assuan-defs.h
@@ -410,7 +410,7 @@ int putc_unlocked (int c, FILE *stream);
#if HAVE_W64_SYSTEM
-# define SOCKET2HANDLE(s) ((void *)(s))
+# define SOCKET2HANDLE(s) ((void *)(uintptr_t)(s))
# define HANDLE2SOCKET(h) ((uintptr_t)(h))
#elif HAVE_W32_SYSTEM
# define SOCKET2HANDLE(s) ((void *)(s))
diff --git a/src/stpcpy.c b/src/stpcpy.c
index 4820c7a..2e4573f 100644
--- a/src/stpcpy.c
+++ b/src/stpcpy.c
@@ -32,9 +32,7 @@
/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */
char *
-__stpcpy (dest, src)
- char *dest;
- const char *src;
+__stpcpy (char *dest, const char *src)
{
register char *d = dest;
register const char *s = src;