- made notepad compile with Cygwin
- made changes to the precompiler directives to check for specific
features instead of checking for the environment version.
diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 3b38a88..0c7864f 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -16,14 +16,6 @@
#include "language.h"
#include "dialog.h"
-#ifdef LCC
- #define LCC_HASASSERT
- #include "lcc.h"
-#else
- #include "wine/version.h"
- #include "winnls.h"
-#endif
-
static LRESULT WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
diff --git a/programs/notepad/lcc.h b/programs/notepad/lcc.h
deleted file mode 100644
index fd2c8ff..0000000
--- a/programs/notepad/lcc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * lcc.h
- *
- * Copyright 1999 by Marcel Baur <mbaur@g26.ethz.ch>
- * To be distributed under the Wine license
- *
- * This file is only required when compiling Notepad using LCC-WIN32
- */
-
-#ifdef LCC
-
- #include <assert.h>
- #include "shellapi.h"
-
- #define HANDLE HANDLE
- #define INVALID_HANDLE_VALUE INVALID_HANDLE_VALUE
-
- #define WINE_RELEASE_INFO "Compiled using LCC"
- #define OIC_WINLOGO 0
-
- #ifndef LCC_HASASSERT
- /* prevent multiple inclusion of assert methods */
-
- int _assertfail(char *__msg, char *__cond, char *__file, int __line) {
-
- CHAR szMessage[255];
-
- strcat(szMessage, "Assert failure ");
- strcat(szMessage, __msg);
- strcat(szMessage, "\n");
- strcat(szMessage, "in line ");
- strcat(szMessage, "of file ");
- strcat(szMessage, __line);
-
- MessageBox(0, szMessage, "ERROR: ASSERT FAILURE", MB_ICONEXCLAMATION);
- }
- #endif
-
-#endif
diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index c6b686a..ae9b645 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -25,10 +25,6 @@
#include <stdio.h>
#include "windows.h"
-#ifdef LCC
-#include "lcc.h"
-#endif
-
#include "main.h"
#include "license.h"
#include "dialog.h"
diff --git a/programs/notepad/main.h b/programs/notepad/main.h
index a54fb63..99a9015 100644
--- a/programs/notepad/main.h
+++ b/programs/notepad/main.h
@@ -11,13 +11,21 @@
#define HELPFILE "notepad.hlp"
#define LOGPREFIX ".LOG"
-#define DEFAULTICON OIC_WINLOGO
/* hide the following from winerc */
#ifndef RC_INVOKED
+#define WINE_RELEASE_INFO "Wine (www.winehq.com)"
+
#include "commdlg.h"
+/***** Compatibility *****/
+
+#ifndef OIC_WINLOGO
+#define OIC_WINLOGO 32517
+#endif
+#define DEFAULTICON OIC_WINLOGO
+
typedef struct
{
HANDLE hInstance;
