From 55e82d6d2b39108c8245990fb348f3a87ea8ef40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 15 Dec 2014 20:17:17 +0000 Subject: [PATCH] [TREE] - Use #pragma once in resource.h - put windows.h after CRT includes. - Convert the main .rc back to ANSI otherwise rc.exe complains, see http://stackoverflow.com/questions/15244065/error-rc2135-in-c-project-due-to-utf-8-encoding-of-rc-file for more details. svn path=/trunk/; revision=65675 --- reactos/base/applications/cmdutils/tree/resource.h | 5 +---- reactos/base/applications/cmdutils/tree/tree.c | 4 +--- reactos/base/applications/cmdutils/tree/tree.rc | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/reactos/base/applications/cmdutils/tree/resource.h b/reactos/base/applications/cmdutils/tree/resource.h index 59827cba4f1..d42cf8cfed1 100644 --- a/reactos/base/applications/cmdutils/tree/resource.h +++ b/reactos/base/applications/cmdutils/tree/resource.h @@ -1,9 +1,6 @@ -#ifndef RESOURCE_H -#define RESOURCE_H +#pragma once #define IDS_USAGE 0 #define IDS_NO_SUBDIRECTORIES 1 #define IDS_FOLDER_PATH 2 #define IDS_VOL_SERIAL 3 - -#endif /* RESOURCE_H */ \ No newline at end of file diff --git a/reactos/base/applications/cmdutils/tree/tree.c b/reactos/base/applications/cmdutils/tree/tree.c index 69d4055c77d..08c14a28d1e 100644 --- a/reactos/base/applications/cmdutils/tree/tree.c +++ b/reactos/base/applications/cmdutils/tree/tree.c @@ -5,11 +5,9 @@ * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala@hotmail.com) */ -// Tree.cpp : Defines the entry point for the console application. -// -#include #include //#include +#include #include "resource.h" diff --git a/reactos/base/applications/cmdutils/tree/tree.rc b/reactos/base/applications/cmdutils/tree/tree.rc index 0dddf0f9a7d..19aec2efa5b 100644 --- a/reactos/base/applications/cmdutils/tree/tree.rc +++ b/reactos/base/applications/cmdutils/tree/tree.rc @@ -1,4 +1,4 @@ -#include +#include #include #include "resource.h"