MinGW compilation error with recent tip

[Kai Habel]

Hello all,

I am trying to compile a recent tip using MinGW (32bit). I am getting 
the following error:

mv -f .deps/liboctinterp_la-symtab.Tpo .deps/liboctinterp_la-symtab.Plo
/bin/sh ../libtool  --tag=CXX   --mode=compile g++ -DHAVE_CONFIG_H -I. 
-I..  -I/
usr/local/octmgw32/include -I../libgnu -I../libgnu -I../libcruft/misc 
-I../liboc
tave -I../liboctave -I. -I. -I/usr/local/octmgw32/include -g -O2  
-DHAVE_CONFIG_
H -mieee-fp -I/c/MinGW/include -I/usr/local/octmgw32/include/freetype2 
-I/usr/lo
cal/octmgw32/include -IC:/MinGW/msys/1.0/local/octmgw32/include   -Wall 
-W -Wsha
dow -Wold-style-cast -Wformat -Wpointer-arith -Wwrite-strings 
-Wcast-align -Wcas
t-qual -g -O2  -g -O2 -MT liboctinterp_la-token.lo -MD -MP -MF 
.deps/liboctinter
p_la-token.Tpo -c -o liboctinterp_la-token.lo `test -f 'token.cc' || 
echo './'`t
oken.cc
libtool: compile:  g++ -DHAVE_CONFIG_H -I. -I.. 
-I/usr/local/octmgw32/include -I
../libgnu -I../libgnu -I../libcruft/misc -I../liboctave -I../liboctave 
-I. -I. -
I/usr/local/octmgw32/include -g -O2 -DHAVE_CONFIG_H -mieee-fp 
-I/c/MinGW/include
 -I/usr/local/octmgw32/include/freetype2 -I/usr/local/octmgw32/include 
-IC:/MinG
W/msys/1.0/local/octmgw32/include -Wall -W -Wshadow -Wold-style-cast 
-Wformat -W
pointer-arith -Wwrite-strings -Wcast-align -Wcast-qual -g -O2 -g -O2 -MT 
libocti
nterp_la-token.lo -MD -MP -MF .deps/liboctinterp_la-token.Tpo -c 
token.cc  -DDLL
_EXPORT -DPIC -o .libs/liboctinterp_la-token.o
sysdep.cc: In function 'void w32_set_octave_home()':^M
sysdep.cc:114:12: error: 'TH32CS_SNAPMODULE32' was not declared in this 
scope^M
sysdep.cc:116:12: warning: use of old-style cast^M
sysdep.cc: In function 'bool same_file_internal(const std::string&, 
const std::s
tring&)':^M
sysdep.cc:213:17: warning: use of old-style cast^M

I think it was introduced with this change:
http://hg.savannah.gnu.org/hgweb/octave/diff/80b30e186b73/src/sysdep.cc

I have tlhelp32.h in C:\MinGW\include but there is no definition of 
TH32CS_SNAPMODULE32, only TH32CS_SNAPMODULE is defined.

If I remove the TH32CS_SNAPMODULE32 in line 113 the compilation proceeds.

What is the right way to avoid this error?

Kai


tlhelp32.h
--------------
...
#ifdef __cplusplus
extern "C" {
#endif
#define HF32_DEFAULT    1
#define HF32_SHARED     2
#define LF32_FIXED      0x1
#define LF32_FREE       0x2
#define LF32_MOVEABLE   0x4
#define MAX_MODULE_NAME32       255
#define TH32CS_SNAPHEAPLIST     0x1
#define TH32CS_SNAPPROCESS      0x2
#define TH32CS_SNAPTHREAD       0x4
#define TH32CS_SNAPMODULE       0x8
#define TH32CS_SNAPALL  
(TH32CS_SNAPHEAPLIST|TH32CS_SNAPPROCESS|TH32CS_SNAPTHREA
D|TH32CS_SNAPMODULE)
#define TH32CS_INHERIT  0x80000000
typedef struct tagHEAPLIST32 {
        DWORD dwSize;
        DWORD th32ProcessID;
        DWORD th32HeapID;
        DWORD dwFlags;
} HEAPLIST32,*PHEAPLIST32,*LPHEAPLIST32;
typedef struct tagHEAPENTRY32 {
...