From 4ebf9509f741b4cd85ff925a4009b41d62223e7c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 Oct 2010 14:40:40 -0400
Subject: [PATCH] Fixes for MSVC compilation

---
 test/Makefile.nmake | 2 +-
 test/tinytest.c     | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/Makefile.nmake b/test/Makefile.nmake
index 696cd0bc..2c240eec 100644
--- a/test/Makefile.nmake
+++ b/test/Makefile.nmake
@@ -1,5 +1,5 @@
 
-CFLAGS=/I.. /I../WIN32-Code /I../include /I../compat /DWIN32 /DHAVE_CONFIG_H
+CFLAGS=/I.. /I../WIN32-Code /I../include /I../compat /DWIN32 /DHAVE_CONFIG_H /DTINYTEST_LOCAL
 
 CFLAGS=$(CFLAGS) /Ox /W3 /wd4996 /nologo
 
diff --git a/test/tinytest.c b/test/tinytest.c
index 11ffc2fe..fff6692c 100644
--- a/test/tinytest.c
+++ b/test/tinytest.c
@@ -28,6 +28,10 @@
 #include <string.h>
 #include <assert.h>
 
+#ifdef TINYTEST_LOCAL
+#include "tinytest_local.h"
+#endif
+
 #ifdef WIN32
 #include <windows.h>
 #else
@@ -40,9 +44,6 @@
 #define __attribute__(x)
 #endif
 
-#ifdef TINYTEST_LOCAL
-#include "tinytest_local.h"
-#endif
 #include "tinytest.h"
 #include "tinytest_macros.h"
 
-- 
2.40.0