Merge pull request #99 from thequux/nbsd

Make build work on NetBSD

src/benchmark.c

@@ -10,7 +10,13 @@
 #include <mach/mach.h>
 #endif
 
+#ifdef __NetBSD__
+#include <sys/resource.h>
+#endif
+
 void h_benchmark_clock_gettime(struct timespec *ts) {
+  if (ts == NULL)
+    return;
 #ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
   /* 
    * This returns real time, not CPU time. See http://stackoverflow.com/a/6725161
@@ -23,6 +29,18 @@ void h_benchmark_clock_gettime(struct timespec *ts) {
   mach_port_deallocate(mach_task_self(), cclock);
   ts->tv_sec = mts.tv_sec;
   ts->tv_nsec = mts.tv_nsec;
+#elif defined(__NetBSD__)
+  // NetBSD doesn't have CLOCK_THREAD_CPUTIME_ID. We'll use getrusage instead
+  struct rusage rusage;
+  getrusage(RUSAGE_SELF, &rusage);
+  ts->tv_nsec = (rusage.ru_utime.tv_usec + rusage.ru_stime.tv_usec) * 1000;
+  // not going to overflow; can be at most 2e9-2
+  ts->tv_sec = rusage.ru_utime.tv_sec + rusage.ru_utime.tv_sec;
+  if (ts->tv_nsec >= 1000000000) {
+    ts->tv_nsec -=   1000000000; // subtract a second
+    ts->tv_sec += 1; // add it back.
+  }
+  assert (ts->tv_nsec <= 1000000000);
 #else
   clock_gettime(CLOCK_THREAD_CPUTIME_ID, ts);
 #endif

src/cfgrammar.c

@@ -648,7 +648,7 @@ void h_pprint_char(FILE *f, char c)
   case '\n': fputs("\\n", f); break;
   case '\r': fputs("\\r", f); break;
   default:
-    if(isprint(c)) {
+    if(isprint((int)c)) {
       fputc(c, f);
     } else {
       fprintf(f, "\\x%.2X", c);

src/parsers/whitespace.c

@@ -10,7 +10,7 @@ static HParseResult* parse_whitespace(void* env, HParseState *state) {
     c = h_read_bits(&state->input_stream, 8, false);
     if (state->input_stream.overrun)
       break;
-  } while (isspace(c));
+  } while (isspace((int)c));
   state->input_stream = bak;
   return h_do_parse((HParser*)env, state);
 }