Merge branch 'win64-7260'

Conflicts:
	src/or/dns.c

3 files changed, 42 insertions, 13 deletions

diff --git a/src/common/compat.c b/src/common/compat.c
index 89f9cfa3d4..d0e516c2ce 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -425,11 +425,10 @@ tor_vasprintf(char **strp, const char *fmt, va_list args)
   else
     *strp = strp_tmp;
   return r;
-#elif defined(_MSC_VER)
+#elif defined(HAVE__VSCPRINTF)
   /* On Windows, _vsnprintf won't tell us the length of the string if it
    * overflows, so we need to use _vcsprintf to tell how much to allocate */
   int len, r;
-  char *res;
   len = _vscprintf(fmt, args);
   if (len < 0) {
     *strp = NULL;
diff --git a/src/common/compat.h b/src/common/compat.h
index 9ad03d33c5..9c544fa309 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -239,6 +239,19 @@ size_t strlcpy(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2));
 #define I64_FORMAT "%lld"
 #endif
 
+#if (SIZEOF_INTPTR_T == SIZEOF_INT)
+#define INTPTR_T_FORMAT "%d"
+#define INTPTR_PRINTF_ARG(x) ((int)(x))
+#elif (SIZEOF_INTPTR_T == SIZEOF_LONG)
+#define INTPTR_T_FORMAT "%ld"
+#define INTPTR_PRINTF_ARG(x) ((long)(x))
+#elif (SIZEOF_INTPTR_T == 8)
+#define INTPTR_T_FORMAT I64_FORMAT
+#define INTPTR_PRINTF_ARG(x) I64_PRINTF_ARG(x)
+#else
+#error Unknown: SIZEOF_INTPTR_T
+#endif
+
 /** Represents an mmaped file. Allocated via tor_mmap_file; freed with
  * tor_munmap_file. */
 typedef struct tor_mmap_t {
@@ -403,11 +416,13 @@ typedef int socklen_t;
  * any inadvertant checks for the socket being <= 0 or > 0 will probably
  * still work. */
 #define tor_socket_t intptr_t
+#define TOR_SOCKET_T_FORMAT INTPTR_T_FORMAT
 #define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET)
 #define TOR_INVALID_SOCKET INVALID_SOCKET
 #else
 /** Type used for a network socket. */
 #define tor_socket_t int
+#define TOR_SOCKET_T_FORMAT "%d"
 /** Macro: true iff 's' is a possible value for a valid initialized socket. */
 #define SOCKET_OK(s) ((s) >= 0)
 /** Error/uninitialized value for a tor_socket_t. */
diff --git a/src/common/procmon.c b/src/common/procmon.c
index 36b1a48553..08fcfec49c 100644
--- a/src/common/procmon.c
+++ b/src/common/procmon.c
@@ -25,9 +25,21 @@
 
 #ifdef _WIN32
 #include <windows.h>
+#endif
 
-/* Windows does not define pid_t, but _getpid() returns an int. */
+#if (0 == SIZEOF_PID_T) && defined(_WIN32)
+/* Windows does not define pid_t sometimes, but _getpid() returns an int.
+ * Everybody else needs to have a pid_t. */
 typedef int pid_t;
+#define PID_T_FORMAT "%d"
+#elif (SIZEOF_PID_T == SIZEOF_INT) || (SIZEOF_PID_T == SIZEOF_SHORT)
+#define PID_T_FORMAT "%d"
+#elif (SIZEOF_PID_T == SIZEOF_LONG)
+#define PID_T_FORMAT "%ld"
+#elif (SIZEOF_PID_T == SIZEOF_INT64_T)
+#define PID_T_FORMAT I64_FORMAT
+#else
+#error Unknown: SIZEOF_PID_T
 #endif
 
 /* Define to 1 if process-termination monitors on this OS and Libevent
@@ -204,15 +216,17 @@ tor_process_monitor_new(struct event_base *base,
 
   if (procmon->hproc != NULL) {
     procmon->poll_hproc = 1;
-    log_info(procmon->log_domain, "Successfully opened handle to process %d; "
+    log_info(procmon->log_domain, "Successfully opened handle to process "
+             PID_T_FORMAT"; "
              "monitoring it.",
-             (int)(procmon->pid));
+             procmon->pid);
   } else {
     /* If we couldn't get a handle to the process, we'll try again the
      * first time we poll. */
-    log_info(procmon->log_domain, "Failed to open handle to process %d; will "
+    log_info(procmon->log_domain, "Failed to open handle to process "
+             PID_T_FORMAT"; will "
              "try again later.",
-             (int)(procmon->pid));
+             procmon->pid);
   }
 #endif
 
@@ -257,7 +271,8 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2,
     if (!GetExitCodeProcess(procmon->hproc, &exit_code)) {
       char *errmsg = format_win32_error(GetLastError());
       log_warn(procmon->log_domain, "Error \"%s\" occurred while polling "
-               "handle for monitored process %d; assuming it's dead.",
+               "handle for monitored process "PID_T_FORMAT"; assuming "
+               "it's dead.",
                errmsg, procmon->pid);
       tor_free(errmsg);
       its_dead_jim = 1;
@@ -273,7 +288,7 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2,
 
     if (procmon->hproc != NULL) {
       log_info(procmon->log_domain, "Successfully opened handle to monitored "
-               "process %d.",
+               "process "PID_T_FORMAT".",
                procmon->pid);
       its_dead_jim = 0;
       procmon->poll_hproc = 1;
@@ -292,8 +307,8 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2,
 
       if (!its_dead_jim)
         log_info(procmon->log_domain, "Failed to open handle to monitored "
-                 "process %d, and error code %lu (%s) is not 'invalid "
-                 "parameter' -- assuming the process is still alive.",
+                 "process "PID_T_FORMAT", and error code %lu (%s) is not "
+                 "'invalid parameter' -- assuming the process is still alive.",
                  procmon->pid,
                  err_code, errmsg);
 
@@ -307,8 +322,8 @@ tor_process_monitor_poll_cb(evutil_socket_t unused1, short unused2,
 #endif
 
   log(its_dead_jim ? LOG_NOTICE : LOG_INFO,
-      procmon->log_domain, "Monitored process %d is %s.",
-      (int)procmon->pid,
+      procmon->log_domain, "Monitored process "PID_T_FORMAT" is %s.",
+      procmon->pid,
       its_dead_jim ? "dead" : "still alive");
 
   if (its_dead_jim) {