i#58 MacOS: fix several minor build issues:

1) Fix build warning on MacOS in LINKSTUB_NEXT_INCOMING due to type
   mismatch

2) Avoid built-in tolower in favor of our own

3) timeval.tv_usec is int, not long, in runstats tool

SVN-Revision: 2317

core/io.c

@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (c) 2011-2012 Google, Inc.  All rights reserved.
+ * Copyright (c) 2011-2013 Google, Inc.  All rights reserved.
  * Copyright (c) 2002-2010 VMware, Inc.  All rights reserved.
  * **********************************************************/
 
@@ -45,11 +45,12 @@
 #include <stdarg.h> /* for varargs */
 
 #ifdef UNIX
-# ifdef MACOS
+#  ifdef MACOS
 /* request extern functions to avoid conflicts with our own tolower() */
-#  define _EXTERNALIZE_CTYPE_INLINES_TOP_
-# endif
-# include <wchar.h>
+#    define _EXTERNALIZE_CTYPE_INLINES_TOP_
+#    define _EXTERNALIZE_CTYPE_INLINES_
+#  endif
+#  include <wchar.h>
 #endif
 
 #ifdef NOT_DYNAMORIO_CORE_PROPER

core/link.h

@@ -331,10 +331,10 @@ typedef struct _coarse_incoming_t {
  */
 #define LINKSTUB_NEXT_INCOMING(l) \
     (LINKSTUB_NORMAL_DIRECT((l)->flags) ? \
-     (((direct_linkstub_t *)(l))->cdl.next_incoming) : \
+     ((linkstub_t*)(((direct_linkstub_t *)(l))->cdl.next_incoming)) : \
      (LINKSTUB_CBR_FALLTHROUGH((l)->flags) ? \
-      (((cbr_fallthrough_linkstub_t *)(l))->cdl.next_incoming) : \
-      (ASSERT(false && "indirect linkstub has no next_incoming"), NULL)))
+      ((linkstub_t*)(((cbr_fallthrough_linkstub_t *)(l))->cdl.next_incoming)) : \
+      (ASSERT(false && "indirect linkstub has no next_incoming"), ((linkstub_t*)NULL))))
 
 /* if sharing a stub then no offs, else offs to get to subsequent stub */
 #define CBR_FALLTHROUGH_STUB_OFFS(f) \

tools/runstats.c

@@ -41,6 +41,15 @@
  * time limit expires
  */
 
+#include "configure.h"
+
+#ifdef MACOS
+/* struct timeval.tv_usec is int, not long int */
+#  define USEC_FMT "d"
+#else
+#  define USEC_FMT "ld"
+#endif
+
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/types.h> /* for wait and mmap */
@@ -265,7 +274,7 @@ print_stats(struct timeval *start, struct timeval *end,
                  (end->tv_sec % 3600) / 60,
                  end->tv_sec % 60);
     } else {
-        fprintf(FP, "%ld:%02ld.%02ldelapsed ",  /* -> m:s.  */
+        fprintf(FP, "%ld:%02ld.%02"USEC_FMT"elapsed ",  /* -> m:s.  */
                  end->tv_sec / 60,
                  end->tv_sec % 60,
                  end->tv_usec / 10000);
@@ -275,9 +284,9 @@ print_stats(struct timeval *start, struct timeval *end,
         fprintf(FP, "%lu%%CPU ", (v * 100 / r));
     else
         fprintf(FP, "?%%CPU ");
-    fprintf(FP, "%ld.%02lduser ",
+    fprintf(FP, "%ld.%02"USEC_FMT"user ",
             ru->ru_utime.tv_sec, ru->ru_utime.TV_MSEC / 10);
-    fprintf(FP, "%ld.%02ldsystem ",
+    fprintf(FP, "%ld.%02"USEC_FMT"system ",
             ru->ru_stime.tv_sec, ru->ru_stime.TV_MSEC / 10);
     fprintf(FP, "(%ldmajor+%ldminor)pagefaults %ldswaps\n",
             ru->ru_majflt,/* Major page faults.  */