From f66b600449beb774d915bb927ec482044956be40 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Mon, 18 May 2009 21:09:25 +0200
Subject: [PATCH] notepad: The UNICODE define isn't needed anymore; remove it.

Add the WINE_NO_UNICODE_MACROS define to prevent the AW form of
functions and types from creeping back in.
---
 programs/notepad/Makefile.in | 2 +-
 programs/notepad/dialog.c    | 2 --
 programs/notepad/main.c      | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in
index a44fe714bce..fcdc8729600 100644
--- a/programs/notepad/Makefile.in
+++ b/programs/notepad/Makefile.in
@@ -7,7 +7,7 @@ APPMODE   = -mwindows -mno-cygwin
 IMPORTS   = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32
 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt
 MODCFLAGS = @BUILTINFLAG@
-EXTRADEFS = -DNO_LIBWINE_PORT
+EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS
 
 C_SRCS = \
 	dialog.c \
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index e2328f4e48b..4e56d8ede16 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define UNICODE
-
 #include <assert.h>
 #include <stdio.h>
 #include <windows.h>
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 9f4d6f92f59..b3c54110c95 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -22,8 +22,6 @@
  *
  */
 
-#define UNICODE
-
 #include <windows.h>
 #include <shlwapi.h>
 #include <stdio.h>