Changeset 4068

Timestamp:

05/03/06 13:21:13 (3 years ago)

Author:

miyoshi

Message:

* mw32term.h: Include <imm.h> explicitly.
Consider HAVE_RECONVERTSTRING' to define RECONVERTSTRING'.

* configure.meadow.bat: Check if the platform has
`RECONVERTSTRING'.

Files:

• trunk/info (modified) (1 prop)
• trunk/nt/ChangeLog.Meadow (modified) (1 diff)
• trunk/nt/configure.meadow.bat (modified) (1 diff)
• trunk/src/mw32term.h (modified) (2 diffs)

trunk/nt/ChangeLog.Meadow

@@ +1 @@
+2006-05-03  MIYOSHI Masanori  <miyoshi@meadowy.org>
+
+        * configure.meadow.bat: Check if the platform has
+        `RECONVERTSTRING'.
+
-2006-05-02  MIYOSHI Masanori  <miyoshi@meadowy.org>
-

trunk/nt/configure.meadow.bat

@@ -297 +297 @@
-del config.settings
-
+rem
+rem check for capabilities of the platform
+rem 
+
+echo.>>..\src\config.h
+echo /* Start of settings from configure.bat.  */>>..\src\config.h
+echo.>>..\src\config.h
+
+rem for gcc
+set JUNK_SRC=junk.c
+set CC_OPT=-DWINVER=0x0400
+set JUNK_OBJ=junk.o
+
+if %COMPILER%==gcc goto check_capability
+rem for VC
+set JUNK_OBJ=junk.obj
+set CC_OPT=-nologo %CC_OPT%
+
+:check_capability
+
+rem
+rem check for RECONVERTSTRING
+rem
+
+set TARGET=HAVE_RECONVERTSTRING
+echo checking for RECONVERTSTRING
+
+echo #include "windows.h" >junk.c
+echo #include "imm.h" >>junk.c
+echo main(){RECONVERTSTRING x;} >>junk.c
+
+%COMPILER% %CC_OPT% -c %JUNK_SRC% >config.capability 2>&1
+if exist %JUNK_OBJ% goto RECONVERTSTRING_yes
+echo ...no
+echo #undef %TARGET% >>..\src\config.h
+goto RECONVERTSTRING_cnt
+
+:RECONVERTSTRING_yes
+echo ...yes
+echo #define %TARGET% >>..\src\config.h
+
+:RECONVERTSTRING_cnt
+rm -f %JUNK_SRC% %JUNK_OBJ%
+
+echo.>>..\src\config.h
+echo /* End of settings from configure.bat.  */>>..\src\config.h
+
+rm config.capability
+
+rem
+rem end of checking for capabilities
+rem 
+
-Rem Some people use WinZip which doesn't create empty directories!
-if not exist ..\site-lisp\nul mkdir ..\site-lisp\

trunk/src/mw32term.h

@@ -31 +31 @@
-#include <w32api.h>
-#endif /* __MINGW32__ */
+#ifdef IME_CONTROL
+#include <imm.h>
+#endif
-
-/* The class of this application.  */
@@ -858 +861 @@
-#endif
-
- (!defined (_IMM_) || (WINVER < 0x040A)) && (!defined(__MINGW32__) || !defined(_IMM_H) || __W32API_MAJOR_VERSION < 3 || __W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 7)
+ndef HAVE_RECONVERTSTRING
-typedef struct tagRECONVERTSTRING {
-  DWORD dwSize;