From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 28 Oct 2014 16:37:17 +0000 (+0000)
Subject: Move #includes to stdafx.h.
X-Git-Url: https://git.rkrishnan.org/simplejson/encoder.py.html?a=commitdiff_plain;h=417ebe6a67afde175886f6a7f0aed9499bf812b8;p=tahoe-lafs%2Ftahoe-lafs.git

Move #includes to stdafx.h.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/misc/build_helpers/windows/installer/installer/installer.cpp b/misc/build_helpers/windows/installer/installer/installer.cpp
index a22df486..2e653bd7 100644
--- a/misc/build_helpers/windows/installer/installer/installer.cpp
+++ b/misc/build_helpers/windows/installer/installer/installer.cpp
@@ -2,21 +2,6 @@
 //
 
 #include "stdafx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <io.h>
-#include <fcntl.h>
-#include <process.h>
-
-// Turn off the warnings nagging you to use the more complicated *_s
-// "secure" functions that are actually more difficult to use securely.
-#pragma warning(disable:4996)
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <wtypes.h>
-#include <objbase.h>
-#include <shldisp.h>
 
 int wmain(int argc, wchar_t *argv[]);
 wchar_t * get_default_destination_dir();
diff --git a/misc/build_helpers/windows/installer/installer/stdafx.h b/misc/build_helpers/windows/installer/installer/stdafx.h
index b005a839..7963cd77 100644
--- a/misc/build_helpers/windows/installer/installer/stdafx.h
+++ b/misc/build_helpers/windows/installer/installer/stdafx.h
@@ -8,8 +8,18 @@
 #include "targetver.h"
 
 #include <stdio.h>
-#include <tchar.h>
+#include <wchar.h>
+#include <stdlib.h>
+#include <io.h>
+#include <fcntl.h>
+#include <process.h>
 
+// Turn off the warnings nagging you to use the more complicated *_s
+// "secure" functions that are actually more difficult to use securely.
+#pragma warning(disable:4996)
 
-
-// TODO: reference additional headers your program requires here
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <wtypes.h>
+#include <objbase.h>
+#include <shldisp.h>