From 9593c338c3d40bc1033e8d06d95ab9913553deaf Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 6 Oct 2016 14:20:16 +0000
Subject: [PATCH] [CONUTILS] Addendum to r72913. CORE-10504

svn path=/trunk/; revision=72921
---
 reactos/sdk/lib/conutils/CMakeLists.txt |  7 +------
 reactos/sdk/lib/conutils/conutils.c     | 11 ++++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/reactos/sdk/lib/conutils/CMakeLists.txt b/reactos/sdk/lib/conutils/CMakeLists.txt
index 22ab6015252..ba7e49ad0a9 100644
--- a/reactos/sdk/lib/conutils/CMakeLists.txt
+++ b/reactos/sdk/lib/conutils/CMakeLists.txt
@@ -1,8 +1,3 @@
 
-## Temporary HACK before we cleanly support UNICODE functions
-add_definitions(-DUNICODE -D_UNICODE)
-
 add_library(conutils conutils.c)
-add_dependencies(conutils psdk)
-target_link_libraries(conutils ${PSEH_LIB})
-# add_importlibs(conutils msvcrt kernel32) ## ntdll
+add_dependencies(conutils xdk)
diff --git a/reactos/sdk/lib/conutils/conutils.c b/reactos/sdk/lib/conutils/conutils.c
index 493fbc147dd..a35a99ddc32 100644
--- a/reactos/sdk/lib/conutils/conutils.c
+++ b/reactos/sdk/lib/conutils/conutils.c
@@ -18,27 +18,28 @@
 /** NOTE: Experimental! Don't use USE_CRT yet because output to console is a bit broken **/
 // #define USE_CRT
 
+/* FIXME: Temporary HACK before we cleanly support UNICODE functions */
+#define UNICODE
+#define _UNICODE
+
 #include <stdlib.h> // limits.h // For MB_LEN_MAX
 
 #ifdef USE_CRT
 #include <fcntl.h>
 #include <io.h>
-#endif /* defined(USE_CRT) */
+#endif /* USE_CRT */
 
 #include <windef.h>
 #include <winbase.h>
-
 #include <winnls.h>
 #include <winuser.h> // MAKEINTRESOURCEW, RT_STRING
-
 #include <wincon.h>  // Console APIs (only if kernel32 support included)
-
-#include "conutils.h"
 #include <strsafe.h>
 
 /* PSEH for SEH Support */
 #include <pseh/pseh2.h>
 
+#include "conutils.h"
 
 // #define RC_STRING_MAX_SIZE  4096
 // #define MAX_BUFFER_SIZE     4096