diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 2008-10-08 13:09:39 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 2008-10-08 13:09:39 +0000 |
| commit | 2b0441401a9686529cfe8d97cf73ecc09a51bef5 (patch) | |
| tree | 1e1bf18bb6810b34696e0e4329a60c3f6c1bcabb /win32caml/inria.h | |
| parent | 29e590ccb9fe1a9330a6809a972a0e84e80653f7 (diff) | |
merge changes between 3.10.2 and the end of branch 3.10
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9079 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'win32caml/inria.h')
| -rw-r--r-- | win32caml/inria.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win32caml/inria.h b/win32caml/inria.h index 8b0ad2262..095cbcc75 100644 --- a/win32caml/inria.h +++ b/win32caml/inria.h @@ -63,7 +63,7 @@ #include "editbuffer.h" #include "history.h" -#if _MSC_VER <= 1200 +#if _MSC_VER <= 1200 && !defined(__MINGW32__) #define GetWindowLongPtr GetWindowLong #define SetWindowLongPtr SetWindowLong #define DWLP_USER DWL_USER |