diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-09 12:50:24 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-09 12:50:24 +0000 |
| commit | 6ea7c7d968799a4579eec0b8dc6c1c50e3c7e75f (patch) | |
| tree | cc3c339ed88ba2681b9606debc264c6e76273f13 /Build/source/texk | |
| parent | c382fe80a1ba2c30e44f541004692634ff8d58c5 (diff) | |
web2c/window: Avoid TeX Live vs W32TeX diffs
git-svn-id: svn://tug.org/texlive/trunk@26971 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
| -rw-r--r-- | Build/source/texk/web2c/window/ChangeLog | 4 | ||||
| -rw-r--r-- | Build/source/texk/web2c/window/win32.c | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/window/ChangeLog b/Build/source/texk/web2c/window/ChangeLog index feab3a70fea..57fba18c125 100644 --- a/Build/source/texk/web2c/window/ChangeLog +++ b/Build/source/texk/web2c/window/ChangeLog @@ -1,3 +1,7 @@ +2012-07-01 Peter Breitenlohner <peb@mppmu.mpg.de> + + * win32.c: Avoid TL W32TeX differences. + 2010-02-21 Peter Breitenlohner <peb@mppmu.mpg.de> * mfdisplay.h: New file with protos for display routines. diff --git a/Build/source/texk/web2c/window/win32.c b/Build/source/texk/web2c/window/win32.c index 844e4b2e935..a520202d3d4 100644 --- a/Build/source/texk/web2c/window/win32.c +++ b/Build/source/texk/web2c/window/win32.c @@ -11,10 +11,15 @@ #ifdef WIN32WIN #include <windows.h> -#ifdef __MINGW32__ -static void Win32Error(const char *caller); +#ifndef min +#define min(a,b) ((a) < (b) ? (a) : (b)) +#endif +#ifndef max +#define max(a,b) ((a) < (b) ? (b) : (a)) #endif +static void Win32Error(const char *caller); + /* The following constant enables some hack that should allow the window to process its messages. Basically, the principle is to @@ -212,7 +217,6 @@ mf_win32_paintrow (screenrow row, ReleaseMutex(hMutex); } -#ifdef __MINGW32__ static void Win32Error(const char *caller) { LPVOID lpMsgBuf; @@ -231,7 +235,6 @@ static void Win32Error(const char *caller) /* Free the buffer. */ LocalFree( lpMsgBuf ); } -#endif LRESULT APIENTRY WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { |