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.

notepad: The UNICODE define isn't needed anymore; remove it.
f66b6004 · Michael Stefaniuc · Alexandre Julliard · 27c8839f · f66b6004 · f66b6004
Commit f66b6004 authored May 18, 2009 by Michael Stefaniuc Committed by Alexandre Julliard May 19, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Makefile.in programs/notepad/Makefile.in +1 -1

dialog.c programs/notepad/dialog.c +0 -2

main.c programs/notepad/main.c +0 -2

No files found.
--- 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 \

--- 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>

--- 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>