1. mst
  2. ooo340

Commits

ihi  committed 2bc129f

CWS-TOOLING: integrate CWS mingwport24
2009-09-13 02:15:22 +0200 tono r276097 : i#105033: mingw port: accept incomplete deflib
2009-09-12 15:14:34 +0200 tono r276096 : i#105012: mingw port: $(PATH) should be quoted
2009-09-12 15:12:49 +0200 tono r276095 : i#105011: mingw port: berkeleydb fix
2009-09-12 15:11:39 +0200 tono r276094 : i#105010: mingw port: decline libdl
2009-09-12 15:10:21 +0200 tono r276093 : i#105009: mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h
2009-09-12 15:08:27 +0200 tono r276092 : reverting changes to revise log messages
2009-09-12 11:55:48 +0200 tono r276090 : i#105014: mingw port: change to latest w32api and mingw runtime
2009-09-12 11:52:12 +0200 tono r276089 : i#105013: mingw port: fix gas error in call.s in bridges
2009-09-12 11:42:04 +0200 tono r276088 : mingw port: should be quoted
2009-09-12 11:35:35 +0200 tono r276087 : mingw port: berkeleydb fix
2009-09-12 11:32:34 +0200 tono r276086 : mingw port: decline libdl
2009-09-12 11:20:50 +0200 tono r276085 : mingw port: sal/osl/w32/file_dirvol.cxx needs ctype.h

  • Participants
  • Parent commits 82ea068
  • Branches default

Comments (0)

Files changed (13)

File berkeleydb/db-4.7.25-mingw.patch

View file
  	 fi
         fi
         ;;
-@@ -27697,6 +27697,18 @@
+@@ -22371,6 +22371,154 @@
+ 
+ 
+ 
++case "$host_os" in
++mingw*)
++for ac_header in execinfo.h sys/time.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++else
++  # Is the header compilable?
++{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++#include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_header_compiler=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <$ac_header>
++_ACEOF
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
++  ac_header_preproc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  ac_header_preproc=no
++fi
++
++rm -f conftest.err conftest.$ac_ext
++{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++echo "${ECHO_T}$ac_header_preproc" >&6; }
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    ( cat <<\_ASBOX
++## ---------------------------------------------------------- ##
++## Report this to Oracle Technology Network Berkeley DB forum ##
++## ---------------------------------------------------------- ##
++_ASBOX
++     ) | sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++{ echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++;;
++*)
+ for ac_header in execinfo.h sys/select.h sys/socket.h sys/time.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+@@ -22515,6 +22663,8 @@
+ 
+ done
+ 
++;;
++esac
+ { echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5
+ echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6; }
+ if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then
+@@ -27697,6 +27847,18 @@
  
  
  

File berkeleydb/makefile.mk

View file
 db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
 db_LIBS=-lmingwthrd
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+CFLAGS+=-D_GLIBCXX_DLL
 db_LIBS+=-lstdc++_s
 .ENDIF
 db_LIBXSO_LIBS=$(LIBSTLPORT) $(db_LIBS)
 db_LIBXSO_LIBS+=-lgcc_s
 .ENDIF
 CONFIGURE_ACTION=..$/dist$/configure
-CONFIGURE_FLAGS=--enable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
+CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)

File bridges/source/cpp_uno/mingw_intel/call.s

View file
     .text
 
 .globl _privateSnippetExecutorGeneral
-    .type   _privateSnippetExecutorGeneral,@function
 _privateSnippetExecutorGeneral:
 .LFBg:
     movl    %esp,%ecx
     leave
     ret
 .LFEg:
-    .size   _privateSnippetExecutorGeneral,.-_privateSnippetExecutorGeneral
+    .long   .-_privateSnippetExecutorGeneral
 
 .globl _privateSnippetExecutorVoid
-    .type   _privateSnippetExecutorVoid,@function
 _privateSnippetExecutorVoid:
 .LFBv:
     movl    %esp,%ecx
     leave
     ret
 .LFEv:
-    .size   _privateSnippetExecutorVoid,.-_privateSnippetExecutorVoid
+    .long   .-_privateSnippetExecutorVoid
 
 .globl _privateSnippetExecutorHyper
-    .type   _privateSnippetExecutorHyper,@function
 _privateSnippetExecutorHyper:
 .LFBh:
     movl    %esp,%ecx
     leave
     ret
 .LFEh:
-    .size   _privateSnippetExecutorHyper,.-_privateSnippetExecutorHyper
+    .long   .-_privateSnippetExecutorHyper
 
 .globl _privateSnippetExecutorFloat
-    .type   _privateSnippetExecutorFloat,@function
 _privateSnippetExecutorFloat:
 .LFBf:
     movl    %esp,%ecx
     leave
     ret
 .LFEf:
-    .size   _privateSnippetExecutorFloat,.-_privateSnippetExecutorFloat
+    .long   .-_privateSnippetExecutorFloat
 
 .globl _privateSnippetExecutorDouble
-    .type   _privateSnippetExecutorDouble,@function
 _privateSnippetExecutorDouble:
 .LFBd:
     movl    %esp,%ecx
     leave
     ret
 .LFEd:
-    .size   _privateSnippetExecutorDouble,.-_privateSnippetExecutorDouble
+    .long   .-_privateSnippetExecutorDouble
 
 .globl _privateSnippetExecutorClass
-    .type   _privateSnippetExecutorClass,@function
 _privateSnippetExecutorClass:
 .LFBc:
     movl    %esp,%ecx
     leave
     ret     $4
 .LFEc:
-    .size   _privateSnippetExecutorClass,.-_privateSnippetExecutorClass
+    .long   .-_privateSnippetExecutorClass
 
-    .section .eh_frame,"a",@progbits
+    .section .eh_frame,"dr"
 .Lframe1:
     .long   .LECIE1-.LSCIE1   # length
 .LSCIE1:
     .uleb128 5
     .align 4
 .LEFDEc:
-    .section .note.GNU-stack,"",@progbits

File external/mingwheaders/makefile.mk

View file
 
 DIRECTXSDK_INCLUDE_DIR=$(DIRECTXSDK_HOME)$/include$/
 
-FILES_TO_COPY_FROM_MINGW=excpt.h \
-			 tchar.h
+FILES_TO_COPY_FROM_MINGW= \
+	excpt.h \
+	 tchar.h
 
-FILES_TO_COPY_FROM_W32API=amvideo.h \
-			  bdatypes.h \
-			  imm.h \
-			  oaidl.h \
-			  objfwd.h \
-			  objidl.h \
-			  uxtheme.h \
-			  winbase.h \
-			  wininet.h \
-			  winnt.h \
-			  winver.h \
-			  wtypes.h
+FILES_TO_COPY_FROM_W32API= \
+	amvideo.h \
+	basetyps.h \
+	oaidl.h \
+	objidl.h \
+	specstrings.h \
+	uxtheme.h \
+	winbase.h \
+	windef.h \
+	wininet.h \
+	winver.h \
+	wtypes.h
 
-FILES_TO_COPY_FROM_SYS=stat.h
+FILES_TO_COPY_FROM_SYS= \
+	stat.h
 
-FILES_TO_COPY_FROM_PSDK=adoctint.h \
-			adodef.h \
-			adoguids.h \
-			adoint.h \
-			bcrypt.h \
-			commctrl.h \
-			control.h \
-			filter.h \
-			gdiplusbitmap.h \
-			gdiplusbrush.h \
-			gdiplusenums.h \
-			gdiplusfont.h \
-			gdiplusheaders.h \
-			gdiplusimageattributes.h \
-			gdiplusimaging.h \
-			gdiplusmatrix.h \
-			gdipluspath.h \
-			gdipluspen.h \
-			gdiplusregion.h \
-			gdiplusstringformat.h \
-			imagehlp.h \
-			inaddr.h \
-			intsafe.h \
-			mapinls.h \
-			mapiwin.h \
-		        msdasc.h \
-		        msi.h \
-		        msiquery.h \
-			multimon.h \
-			ncrypt.h \
-		        ntquery.h \
-			ocidl.h \
-			oledb.h \
-			oleidl.h \
-			propidl.h \
-			propkeydef.h \
-			propsys.h \
-			qedit.h \
-			shlobj.h \
-			shobjidl.h \
-			shtypes.h \
-			specstrings.h \
-			specstrings_adt.h \
-			specstrings_strict.h \
-			sspi.h \
-			strmif.h \
-			strsafe.h \
-			structuredquery.h \
-			urlmon.h \
-			wincrypt.h \
-			wingdi.h \
-			winsock2.h \
-			winuser.h \
-			ws2def.h \
-			ws2ipdef.h \
-			ws2tcpip.h \
-			wspiapi.h \
-			adoid.h \
-			amstream.h \
-			austream.h \
-			ddstream.h \
-			dispex.h \
-			dshow.h \
-			exdispid.h \
-			gdiplus.h \
-			mmstream.h \
-			msxml.h \
-			oleauto.h \
-			olectl.h \
-			qos.h \
-			shlguid.h \
-			transact.h \
-			winerror.h
+FILES_TO_COPY_FROM_PSDK= \
+	adoctint.h \
+	adodef.h \
+	adoguids.h \
+	adoint.h \
+	bcrypt.h \
+	commctrl.h \
+	control.h \
+	dispex.h \
+	filter.h \
+	gdiplusbitmap.h \
+	gdiplusbrush.h \
+	gdiplusenums.h \
+	gdiplusfont.h \
+	gdiplusheaders.h \
+	gdiplusimageattributes.h \
+	gdiplusimaging.h \
+	gdiplusmatrix.h \
+	gdipluspath.h \
+	gdipluspen.h \
+	gdiplusregion.h \
+	gdiplusstringformat.h \
+	imm.h \
+	imagehlp.h \
+	mapiwin.h \
+	msdasc.h \
+	msi.h \
+	msiquery.h \
+	multimon.h \
+	ntquery.h \
+	ocidl.h \
+	oleauto.h \
+	olectl.h \
+	oledb.h \
+	oleidl.h \
+	propidl.h \
+	propkeydef.h \
+	propsys.h \
+	shlobj.h \
+	shobjidl.h \
+	shtypes.h \
+	sspi.h \
+	strmif.h \
+	strsafe.h \
+	structuredquery.h \
+	urlmon.h \
+	wincrypt.h \
+	winerror.h \
+	wingdi.h \
+	wintrust.h \
+	winuser.h \
+	wspiapi.h \
+	exdispid.h \
+	dshow.h \
+	gdiplus.h \
+	msxml.h \
+	ncrypt.h \
+	shlguid.h \
+	transact.h
 
 .IF "$(DISABLE_ATL)"==""
 MINGWHEADER_ATL_PATCH_TARGET=$(MISC)$/mingwheader_atl_patch
 MINGWHEADER_ATL_COPY_TARGET=$(MISC)$/mingwheader_atl_copy
-FILES_TO_COPY_FROM_ATL=atlbase.h \
-		       atlcom.h \
-		       atlconv.h \
-		       atlctl.h \
-		       atlwin.h \
-		       statreg.h
+FILES_TO_COPY_FROM_ATL= \
+	atlbase.h \
+	atlcom.h \
+	atlconv.h \
+	atlctl.h \
+	atlwin.h \
+	statreg.h
 .ENDIF
 
-FILES_TO_COPY_FROM_DIRECTXSDK=dxtrans.h \
-			      d3dx9.h \
-			      d3d.h \
-			      d3dtypes.h \
-			      d3dx9math.h \
-			      d3dx9math.inl \
-			      d3dx9core.h
+FILES_TO_COPY_FROM_DIRECTXSDK= \
+	d3dtypes.h \
+	d3dx9core.h \
+	d3dx9math.h \
+	d3dx9math.inl \
+	dxtrans.h \
+	d3dx9.h
 
 $(MISC)$/mingwheader_patch_all : $(MISC)$/mingwheader_patch $(MINGWHEADER_ATL_PATCH_TARGET) $(LB)$/libmsvcrt.a
 
 
 $(LB)$/libmsvcrt.a:
 .IF "$(USE_MINGW)" == "cygwin"
-	$(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/mingw/libmsvcrt.a > $(MISC)$/msvcrt.nm
+	$(COPY) $(COMPATH)$/lib/mingw/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
 .ELSE
-	$(WRAPCMD) nm -g --defined-only $(COMPATH)$/lib/libmsvcrt.a > $(MISC)$/msvcrt.nm
+	$(COPY) $(COMPATH)$/lib/libmsvcrt.a $(LB)$/libmsvcrt_orig.a
 .ENDIF
+	cd $(LB) && ar -x libmsvcrt_orig.a ofmt_stub.o
+	ar -d $(LB)$/libmsvcrt_orig.a ofmt_stub.o
+	nm -g --defined-only $(LB)$/libmsvcrt_orig.a > $(MISC)$/msvcrt.nm
 	echo EXPORTS > $(MISC)$/msvcrt.def
 	sed -ne 's/.* T _//p' $(MISC)$/msvcrt.nm | sort >> $(MISC)$/msvcrt.def
 	-sed -ne 's/.* I __imp__//p' $(MISC)$/msvcrt.nm | sort | diff - $(MISC)$/msvcrt.def | \
 		sed -ne 's/^< \(.*\)$/\1 DATA/p' > $(MISC)$/msvcrtdata.def
 	cat $(MISC)$/msvcrtdata.def >> $(MISC)$/msvcrt.def
 	dlltool --dllname msvcrt.dll --input-def=$(MISC)$/msvcrt.def --kill-at --output-lib=$(LB)$/libmsvcrt.a
+	cd $(LB) && ar -rs libmsvcrt.a ofmt_stub.o
 
 clean:
 	-$(RM) $(MISC)$/mingw$/include$/*.h

File external/mingwheaders/mingw_headers.patch

View file
 +#endif
 +
 +#endif
---- include/winres.h.orig	2006-07-22 23:41:18.000000000 +0900
-+++ include/winres.h	2006-07-22 23:41:18.000000000 +0900
-@@ -0,0 +1,13 @@
-+#ifndef _WINRES_H
-+#define _WINRES_H
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
-+
-+#define VS_VERSION_INFO 1
-+#include <winresrc.h>
-+#ifdef IDC_STATIC
-+#undef IDC_STATIC
-+#endif
-+#define IDC_STATIC (-1)
-+#endif
---- include/excpt.h.orig	2005-01-14 05:19:52.000000000 +0900
-+++ include/excpt.h	2006-12-31 09:21:56.000000000 +0900
+--- include/excpt.h.orig	2009-01-11 04:32:43.000000000 +0900
++++ include/excpt.h	2009-08-21 09:21:56.000000000 +0900
 @@ -16,8 +16,11 @@
  
  /* All the headers include this file. */
  #endif
  
  #endif	/* Not RC_INVOKED */
---- include/tchar.h.orig	2006-03-26 09:21:36.000000000 +0900
-+++ include/tchar.h	2006-03-26 09:21:42.000000000 +0900
+--- include/tchar.h.orig	2009-01-11 04:32:46.000000000 +0900
++++ include/tchar.h	2009-08-21 09:21:56.000000000 +0900
 @@ -223,6 +223,9 @@
  #define _ttelldir	_wtelldir
  #define _tseekdir	_wseekdir
  #endif	/* Not _UNICODE */
  
  /*
---- include/amvideo.h.orig	2006-11-19 08:08:30.000000000 +0900
-+++ include/amvideo.h	2007-01-16 23:11:24.656250000 +0900
+--- include/amvideo.h.orig	2008-12-06 11:31:53.000000000 +0900
++++ include/amvideo.h	2009-08-21 09:21:56.000000000 +0900
 @@ -52,10 +52,10 @@
  	BITMAPINFOHEADER bmiHeader;
  } VIDEOINFOHEADER;
  	REFERENCE_TIME AvgTimePerFrame;
  	BITMAPINFOHEADER bmiHeader;
  	union {
---- include/bdatypes.h.orig	2006-11-19 08:08:30.000000000 +0900
-+++ include/bdatypes.h	2007-01-16 23:21:10.062500000 +0900
-@@ -17,9 +17,9 @@
- } MEDIA_SAMPLE_CONTENT;
- /*--- DirectShow Reference - DirectShow Structures */
- typedef struct {
--	DWORD dwOffset
--	DWORD dwPacketLength
--	DWORD dwStride
-+	DWORD dwOffset;
-+	DWORD dwPacketLength;
-+	DWORD dwStride;
- } MPEG2_TRANSPORT_STRIDE;
- typedef struct {
- 	ULONG ulPID;
---- include/imm.h.orig	2007-12-27 23:07:19.000000000 +0900
-+++ include/imm.h	2008-11-08 07:28:48.983375000 +0900
-@@ -105,6 +105,7 @@
- #define UI_CAP_ROTANY 4
- #define SCS_CAP_COMPSTR 1
- #define SCS_CAP_MAKEREAD 2
-+#define SCS_CAP_SETRECONVERTSTRING 4
- #define SELECT_CAP_CONVERSION 1
- #define SELECT_CAP_SENTENCE 2
- #define GGL_LEVEL 1
-@@ -208,6 +209,7 @@
- #define IME_REGWORD_STYLE_USER_FIRST 0x80000000
- #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF
- #define IMR_RECONVERTSTRING 4
-+#define IMR_CONFIRMRECONVERTSTRING 5
- #define IMR_QUERYCHARPOSITION 6
- #define SOFTKEYBOARD_TYPE_T1 1
- #define SOFTKEYBOARD_TYPE_C1 2
-@@ -285,7 +287,7 @@
-   DWORD dwCompStrOffset;
-   DWORD dwTargetStrLen;
-   DWORD dwTargetStrOffset;
--} RECONVERTSTRING, *PRECONVERTSTRING;
-+} RECONVERTSTRING, *PRECONVERTSTRING, *LPRECONVERTSTRING;
- typedef struct tagREGISTERWORDA {
- 	LPSTR lpReading;
- 	LPSTR lpWord;
---- include/oaidl.h.orig	2006-11-19 08:08:33.000000000 +0900
-+++ include/oaidl.h	2007-01-20 09:08:24.625000000 +0900
-@@ -78,6 +78,8 @@
+--- include/basetyps.h.orig	2008-12-06 11:31:53.000000000 +0900
++++ include/basetyps.h	2009-08-21 09:21:56.000000000 +0900
+@@ -80,6 +80,8 @@
+    CONST_VTABLE struct i##Vtbl
+ #  define DECLARE_INTERFACE_(i,b) DECLARE_INTERFACE(i)
+ # endif
++# define DECLARE_INTERFACE_IID(i,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE(i)
++# define DECLARE_INTERFACE_IID_(i,b,s) EXTERN_C const IID IID_##i; DECLARE_INTERFACE_(i,b)
+ # define BEGIN_INTERFACE
+ # define END_INTERFACE
+ 
+--- include/oaidl.h.orig	2008-12-06 11:32:03.000000000 +0900
++++ include/oaidl.h	2009-08-21 09:21:56.000000000 +0900
+@@ -65,8 +65,11 @@
+ 
+ typedef _COM_interface ITypeLib *LPTYPELIB;
+ typedef _COM_interface ITypeLib2 *LPTYPELIB2;
++typedef _COM_interface ICreateTypeInfo ICreateTypeInfo;
+ typedef _COM_interface ICreateTypeInfo *LPCREATETYPEINFO;
+ typedef _COM_interface ICreateTypeInfo2 *LPCREATETYPEINFO2;
++typedef _COM_interface ICreateTypeLib ICreateTypeLib;
++typedef _COM_interface ICreateTypeLib2 ICreateTypeLib2;
+ typedef _COM_interface ICreateTypeLib *LPCREATETYPELIB;
+ typedef _COM_interface ICreateTypeLib2 *LPCREATETYPELIB2;
+ typedef _COM_interface ITypeComp *LPTYPECOMP;
+@@ -78,6 +81,8 @@
  typedef _COM_interface ICreateErrorInfo *LPCREATEERRORINFO;
  typedef _COM_interface ISupportErrorInfo *LPSUPPORTERRORINFO;
  typedef _COM_interface IRecordInfo *LPRECORDINFO;
  
  extern const IID IID_ITypeLib;
  extern const IID IID_ITypeLib2;
-@@ -772,6 +774,29 @@
+@@ -772,6 +777,29 @@
  };
  #undef INTERFACE
  
  #ifdef __cplusplus
  }
  #endif
---- include/objidl.h.orig	2006-11-19 08:08:34.000000000 +0900
-+++ include/objidl.h	2008-11-30 11:56:53.875000000 +0900
-@@ -1,3 +1,4 @@
+--- include/objidl.h.orig	2008-12-06 11:32:04.000000000 +0900
++++ include/objidl.h	2009-08-21 09:21:56.000000000 +0900
+@@ -1,3 +1,6 @@
++#include <windows.h>
 +#include <ole2.h>
++
  #ifndef _OBJIDL_H
  #define _OBJIDL_H
  #if __GNUC__ >= 3
-@@ -127,6 +128,7 @@
- 	struct IAdviseSink *pAdvSink;
- 	DWORD dwConnection;
- } STATDATA;
-+#if 0
- typedef struct tagSTATPROPSETSTG {
- 	FMTID fmtid;
- 	CLSID clsid;
-@@ -135,6 +137,7 @@
- 	FILETIME ctime;
- 	FILETIME atime;
- } STATPROPSETSTG;
-+#endif
- typedef enum tagEXTCONN {
- 	EXTCONN_STRONG=1,
- 	EXTCONN_WEAK=2,
-@@ -247,6 +250,7 @@
- typedef enum tagSERVERCALL {
- 	SERVERCALL_ISHANDLED,SERVERCALL_REJECTED,SERVERCALL_RETRYLATER
- } SERVERCALL;
-+#if 0
- typedef struct tagCAUB {
- 	ULONG cElems;
- 	unsigned char *pElems;
-@@ -406,6 +410,7 @@
- 	PROPSETFLAG_DEFAULT,PROPSETFLAG_NONSIMPLE,PROPSETFLAG_ANSI,
- 	PROPSETFLAG_UNBUFFERED=4
- } PROPSETFLAG;
-+#endif
- typedef struct tagSTORAGELAYOUT {
- 	DWORD LayoutType;
- 	OLECHAR* pwcsElementName;
-@@ -454,8 +459,10 @@
- DECLARE_ENUMERATOR(FORMATETC);
- DECLARE_ENUMERATOR(HLITEM);
- DECLARE_ENUMERATOR(STATDATA);
-+#if 0
- DECLARE_ENUMERATOR(STATPROPSETSTG);
- DECLARE_ENUMERATOR(STATPROPSTG);
-+#endif
- DECLARE_ENUMERATOR(STATSTG);
- DECLARE_ENUMERATOR_(IEnumString,LPOLESTR);
- DECLARE_ENUMERATOR_(IEnumMoniker,_COM_interface IMoniker*);
-@@ -880,8 +887,8 @@
+@@ -880,8 +883,8 @@
  	STDMETHOD(QueryInterface)(THIS_ REFIID,PVOID*) PURE;
  	STDMETHOD_(ULONG,AddRef)(THIS) PURE;
  	STDMETHOD_(ULONG,Release)(THIS) PURE;
  };
  #undef INTERFACE
  
-@@ -927,6 +934,7 @@
- };
- #undef INTERFACE
+--- include/specstrings.h.orig	2008-12-06 11:32:09.000000000 +0900
++++ include/specstrings.h	2009-08-21 09:21:56.000000000 +0900
+@@ -11,8 +11,31 @@
+ /* __in and __out currently conflict with libstdc++, use with caution */
  
-+#if 0
- EXTERN_C const IID IID_IPropertyStorage;
- #define INTERFACE IPropertyStorage
- DECLARE_INTERFACE_(IPropertyStorage,IUnknown)
-@@ -962,6 +970,7 @@
- 	STDMETHOD(Enum)(THIS_ IEnumSTATPROPSETSTG**) PURE;
- };
- #undef INTERFACE
-+#endif
  
- EXTERN_C const IID IID_IClientSecurity;
- #define INTERFACE IClientSecurity
---- include/objfwd.h.orig	2006-03-26 09:21:36.000000000 +0900
-+++ include/objfwd.h	2006-03-26 09:21:42.000000000 +0900
-@@ -27,7 +27,7 @@
- typedef _COM_interface IEnumFORMATETC *LPENUMFORMATETC;
- typedef _COM_interface IEnumSTATDATA *LPENUMSTATDATA;
- typedef _COM_interface IEnumSTATSTG *LPENUMSTATSTG;
--typedef _COM_interface IEnumSTATPROPSTG LPENUMSTATPROPSTG;
-+typedef _COM_interface IEnumSTATPROPSTG *LPENUMSTATPROPSTG;
- typedef _COM_interface IEnumString *LPENUMSTRING;
- typedef _COM_interface IEnumUnknown *LPENUMUNKNOWN;
- typedef _COM_interface IStorage *LPSTORAGE;
---- include/uxtheme.h.orig	2006-11-19 08:08:36.000000000 +0900
-+++ include/uxtheme.h	2007-01-18 18:51:37.125000000 +0900
++#define __RPC__deref_inout_opt
++#define __RPC__deref_opt_inout_ecount_full_opt(size)
++#define __RPC__deref_opt_inout_opt
++#define __RPC__deref_out
++#define __RPC__deref_out_ecount_full_opt(size)
++#define __RPC__deref_out_opt
++#define __RPC__deref_out_opt_string
++#define __RPC__in
++#define __RPC__in_ecount_full(size)
++#define __RPC__in_ecount_full_opt(size)
++#define __RPC__in_opt
++#define __RPC__inout
++#define __RPC__inout_ecount_full(size)
++#define __RPC__inout_ecount_full_opt(size)
++#define __RPC__inout_opt
++#define __RPC__out
++#define __RPC__out_ecount_full(size)
++#define __RPC__out_ecount_full_string(size)
++#define __RPC__out_ecount_part(size,init)
++#define __RPC_unique_pointer
+ #define __bcount(size)
+ #define __bcount_opt(size)
++#define __callback
++#define __checkReturn
++#define __deref
+ #define __deref_bcount(size)
+ #define __deref_bcount_opt(size)
+ #define __deref_ecount(size)
+@@ -36,6 +59,7 @@
+ #define __deref_inout_ecount_opt(size)
+ #define __deref_inout_ecount_part(size,length)
+ #define __deref_inout_ecount_part_opt(size,length)
++#define __deref_inout_ecount_z(size)
+ #define __deref_inout_opt
+ #define __deref_opt_bcount(size)
+ #define __deref_opt_bcount_opt(size)
+@@ -89,14 +113,23 @@
+ #define __deref_out_ecount_part(size,length)
+ #define __deref_out_ecount_part_opt(size,length)
+ #define __deref_out_opt
++#define __deref_out_z
++#define __deref_out_z_opt
+ #define __ecount(size)
+ #define __ecount_opt(size)
++#define __field_bcount(size)
++#define __field_ecount(size)
++#define __field_ecount_opt(size)
++#define __format_string
++#define __gdi_entry
+ #define __in
+ #define __in_bcount(size)
+ #define __in_bcount_opt(size)
+ #define __in_ecount(size)
+ #define __in_ecount_opt(size)
+ #define __in_opt
++#define __in_xcount(size)
++#define __in_z_opt
+ #define __inout
+ #define __inout_bcount(size)
+ #define __inout_bcount_full(size)
+@@ -111,7 +144,12 @@
+ #define __inout_ecount_part(size,length)
+ #define __inout_ecount_part_opt(size,length)
+ #define __inout_opt
++#define __inout_xcount(size)
++#define __notnull
++#define __nullnullterminated
++#define __nullterminated
+ #define __out
++#define __out_awcount(expr,size)
+ #define __out_bcount(size)
+ #define __out_bcount_full(size)
+ #define __out_bcount_full_opt(size)
+@@ -119,12 +157,20 @@
+ #define __out_bcount_part(size,length)
+ #define __out_bcount_part_opt(size,length)
+ #define __out_ecount(size)
++#define __out_ecount(size)
+ #define __out_ecount_full(size)
+ #define __out_ecount_full_opt(size)
+ #define __out_ecount_opt(size)
+ #define __out_ecount_part(size,length)
+ #define __out_ecount_part_opt(size,length)
+ #define __out_opt 
++#define __out_xcount(size)
++#define __out_xcount_opt(size)
++#define __reserved
++#define __struct_bcount(size)
++#define __success(expr)
++#define __typefix(ctype)
++#define __unaligned
+ 
+ 
+ #endif /*_SPECSTRINGS_H */
+--- include/uxtheme.h.orig	2008-12-06 11:32:11.000000000 +0900
++++ include/uxtheme.h	2009-08-21 09:21:56.000000000 +0900
 @@ -10,7 +10,7 @@
  extern "C" {
  #endif
  
 -#if (_WIN32_WINNT >= 0x0501)
-+//#if (_WIN32_WINNT >= 0x0501)
++#if (_WIN32_WINNT >= 0x0500)
  #define DTBG_CLIPRECT 0x00000001
  #define DTBG_DRAWSOLID 0x00000002
  #define DTBG_OMITBORDER 0x00000004
-@@ -265,7 +265,7 @@
- HTHEME WINAPI OpenThemeData(HWND,LPCWSTR);
- void WINAPI SetThemeAppProperties(DWORD);
- HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR);
--#endif
-+//#endif
- 
- #ifdef __cplusplus
- }
---- include/winbase.h.orig	2006-11-19 08:08:36.000000000 +0900
-+++ include/winbase.h	2007-07-27 21:14:27.621750000 +0900
-@@ -993,12 +993,14 @@
- 	WORD Reserved2;
- 	CHAR szPathName[OFS_MAXPATHNAME];
- } OFSTRUCT,*LPOFSTRUCT,*POFSTRUCT;
-+#if 0
- typedef struct _WIN_CERTIFICATE {
-       DWORD dwLength;
-       WORD wRevision;
-       WORD wCertificateType;
-       BYTE bCertificate[1];
- } WIN_CERTIFICATE, *LPWIN_CERTIFICATE;
-+#endif
- #if (_WIN32_WINNT >= 0x0501)
- typedef struct tagACTCTXA {
- 	ULONG cbSize;
-@@ -1342,8 +1344,8 @@
+--- include/winbase.h.orig	2008-12-06 11:32:11.000000000 +0900
++++ include/winbase.h	2009-08-21 09:21:56.000000000 +0900
+@@ -1354,8 +1354,8 @@
  WINBASEAPI HANDLE WINAPI FindFirstFileExW(LPCWSTR,FINDEX_INFO_LEVELS,PVOID,FINDEX_SEARCH_OPS,PVOID,DWORD);
  WINBASEAPI BOOL WINAPI FindFirstFreeAce(PACL,PVOID*);
  #if (_WIN32_WINNT >= 0x0500)
  WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD);
  WINBASEAPI HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD);
  #endif
-@@ -1351,7 +1353,7 @@
+@@ -1363,7 +1363,7 @@
  WINBASEAPI BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA);
  WINBASEAPI BOOL WINAPI FindNextFileW(HANDLE,LPWIN32_FIND_DATAW);
  #if (_WIN32_WINNT >= 0x0500)
  WINBASEAPI BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD);
  WINBASEAPI BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD);
  WINBASEAPI BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD);
-@@ -1463,10 +1465,10 @@
+@@ -1475,10 +1475,10 @@
  WINBASEAPI DWORD WINAPI GetLogicalDrives(void);
  WINBASEAPI DWORD WINAPI GetLogicalDriveStringsA(DWORD,LPSTR);
  WINBASEAPI DWORD WINAPI GetLogicalDriveStringsW(DWORD,LPWSTR);
  WINBASEAPI BOOL WINAPI GetMailslotInfo(HANDLE,PDWORD,PDWORD,PDWORD,PDWORD);
  WINBASEAPI DWORD WINAPI GetModuleFileNameA(HINSTANCE,LPSTR,DWORD);
  WINBASEAPI DWORD WINAPI GetModuleFileNameW(HINSTANCE,LPWSTR,DWORD);
-@@ -1504,9 +1506,9 @@
+@@ -1519,9 +1519,9 @@
  #endif
  WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID);
  WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE);
  #if (_WIN32_WINNT >= 0x0500)
  WINBASEAPI BOOL WINAPI GetProcessIoCounters(HANDLE,PIO_COUNTERS);
  #endif
-@@ -1784,9 +1786,9 @@
+@@ -1802,9 +1802,9 @@
  WINBASEAPI BOOL WINAPI OpenProcessToken(HANDLE,DWORD,PHANDLE);
  WINBASEAPI HANDLE WINAPI OpenSemaphoreA(DWORD,BOOL,LPCSTR);
  WINBASEAPI HANDLE WINAPI OpenSemaphoreW(DWORD,BOOL,LPCWSTR);
  WINBASEAPI BOOL WINAPI OpenThreadToken(HANDLE,DWORD,BOOL,PHANDLE);
  WINBASEAPI HANDLE WINAPI OpenWaitableTimerA(DWORD,BOOL,LPCSTR);
  WINBASEAPI HANDLE WINAPI OpenWaitableTimerW(DWORD,BOOL,LPCWSTR);
-@@ -2024,6 +2026,7 @@
- WINBASEAPI BOOL WINAPI WriteProfileStringA(LPCSTR,LPCSTR,LPCSTR);
- WINBASEAPI BOOL WINAPI WriteProfileStringW(LPCWSTR,LPCWSTR,LPCWSTR);
- WINBASEAPI DWORD WINAPI WriteTapemark(HANDLE,DWORD,DWORD,BOOL);
-+WINBASEAPI BOOL WINAPI CheckTokenMembership(HANDLE,PSID,PBOOL);
- #define Yield()
- #if (_WIN32_WINNT >= 0x0501)
- WINBASEAPI BOOL WINAPI ZombifyActCtx(HANDLE);
-@@ -2130,9 +2133,9 @@
+@@ -2029,6 +2029,7 @@
+ WINBASEAPI DWORD WINAPI WaitForSingleObjectEx(HANDLE,DWORD,BOOL);
+ WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD);
+ WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD);
++WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT);
+ WINBASEAPI BOOL WINAPI WinLoadTrustProvider(GUID*);
+ WINBASEAPI BOOL WINAPI WriteFile(HANDLE,PCVOID,DWORD,PDWORD,LPOVERLAPPED);
+ WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,PCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
+@@ -2151,9 +2152,9 @@
  #define GetFileAttributesEx GetFileAttributesExW
  #define GetFullPathName GetFullPathNameW
  #define GetLogicalDriveStrings GetLogicalDriveStringsW
  #define GetModuleFileName GetModuleFileNameW
  #define GetModuleHandle GetModuleHandleW
  #if (_WIN32_WINNT >= 0x0500)
-@@ -2325,9 +2328,9 @@
+@@ -2346,9 +2347,9 @@
  #define GetFileAttributesEx GetFileAttributesExA
  #define GetFullPathName GetFullPathNameA
  #define GetLogicalDriveStrings GetLogicalDriveStringsA
  #define GetNamedPipeHandleState GetNamedPipeHandleStateA
  #define GetModuleHandle GetModuleHandleA
  #if (_WIN32_WINNT >= 0x0500)
---- include/wininet.h.orig	2006-03-26 09:21:36.000000000 +0900
-+++ include/wininet.h	2006-04-04 23:18:14.000000000 +0900
+--- include/windef.h.orig	2008-12-06 11:32:12.000000000 +0900
++++ include/windef.h	2009-08-21 09:21:56.000000000 +0900
+@@ -251,6 +251,7 @@
+ typedef unsigned int UINT,*PUINT,*LPUINT;
+ 
+ #include <winnt.h>
++#include <specstrings.h>
+ 
+ typedef UINT_PTR WPARAM;
+ typedef LONG_PTR LPARAM;
+--- include/wininet.h.orig	2008-12-06 11:32:13.000000000 +0900
++++ include/wininet.h	2009-08-21 09:21:56.000000000 +0900
 @@ -868,6 +868,7 @@
  BOOL WINAPI InternetAutodial(DWORD,DWORD);
  BOOL WINAPI InternetAutodialHangup(DWORD);
  BOOL WINAPI InternetSetDialState(LPCTSTR,DWORD,DWORD);
  BOOL WINAPI InternetReadFileExA(HINTERNET,LPINTERNET_BUFFERSA,DWORD,DWORD_PTR);
  BOOL WINAPI InternetReadFileExW(HINTERNET,LPINTERNET_BUFFERSW,DWORD,DWORD_PTR);
---- include/winnt.h.orig	2006-11-19 08:08:37.000000000 +0900
-+++ include/winnt.h	2007-01-16 07:06:57.796875000 +0900
-@@ -67,9 +67,9 @@
- #endif
- #endif
- 
--#ifndef C_ASSERT
--#define C_ASSERT(expr) typedef char __C_ASSERT__[(expr)?1:-1]
--#endif
-+//#ifndef C_ASSERT
-+//#define C_ASSERT(expr) typedef char __C_ASSERT__[(expr)?1:-1]
-+//#endif
- 
- #ifndef VOID
- #define VOID void
---- include/winver.h.orig	2006-03-26 09:21:36.000000000 +0900
-+++ include/winver.h	2006-03-26 09:21:42.000000000 +0900
+--- include/winver.h.orig	2008-12-06 11:32:14.000000000 +0900
++++ include/winver.h	2009-08-21 09:21:56.000000000 +0900
 @@ -101,10 +101,10 @@
  DWORD WINAPI VerFindFileW(DWORD,LPWSTR,LPWSTR,LPWSTR,LPWSTR,PUINT,LPWSTR,PUINT);
  DWORD WINAPI VerInstallFileA(DWORD,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,LPSTR,PUINT);
  DWORD WINAPI VerLanguageNameA(DWORD,LPSTR,DWORD);
  DWORD WINAPI VerLanguageNameW(DWORD,LPWSTR,DWORD);
  BOOL WINAPI VerQueryValueA(const LPVOID,LPSTR,LPVOID*,PUINT);
---- include/wtypes.h.orig	2006-11-19 08:08:37.000000000 +0900
-+++ include/wtypes.h	2007-01-19 23:05:02.531250000 +0900
+--- include/wtypes.h.orig	2008-12-06 11:32:14.000000000 +0900
++++ include/wtypes.h	2009-08-21 09:21:56.000000000 +0900
 @@ -66,6 +66,19 @@
  	unsigned short asData[1];
  }FLAGGED_WORD_BLOB;
  #ifdef __cplusplus
  }
  #endif
---- include/sys/stat.h.orig	2006-06-25 19:45:42.000000000 +0900
-+++ include/sys/stat.h	2006-12-30 18:26:27.578125000 +0900
-@@ -11,6 +11,9 @@
- 
- #ifndef _STAT_H_
- #define _STAT_H_
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- /* All the headers include this file. */
- #include <_mingw.h>
---- include/adoctint.h.orig	2005-04-04 18:50:18.000000000 +0900
-+++ include/adoctint.h	2007-12-14 23:43:07.754125000 +0900
+--- include/adoctint.h.orig	2008-01-18 22:17:10.000000000 +0900
++++ include/adoctint.h	2009-08-21 09:21:56.000000000 +0900
 @@ -11,6 +11,9 @@
  //--------------------------------------------------------------------
  #ifndef _ADOCTINT_H_
          
          virtual /* [helpcontext] */ HRESULT STDMETHODCALLTYPE Delete( 
              /* [in] */ VARIANT Item) = 0;
---- include/adodef.h.orig	2005-04-04 18:50:18.000000000 +0900
-+++ include/adodef.h	2007-01-05 21:48:51.265625000 +0900
+--- include/adodef.h.orig	2008-01-18 22:17:10.000000000 +0900
++++ include/adodef.h	2009-08-21 09:21:56.000000000 +0900
 @@ -12,6 +12,9 @@
  
  #ifndef _ADODEF_H_
  
  // TYPELIB MAJOR VERSIONS
  #define ADO_MAJOR			6
---- include/adoguids.h.orig	2005-04-04 18:50:18.000000000 +0900
-+++ include/adoguids.h	2007-01-05 21:50:10.265625000 +0900
+--- include/adoguids.h.orig	2008-01-18 22:17:10.000000000 +0900
++++ include/adoguids.h	2009-08-21 09:21:56.000000000 +0900
 @@ -11,6 +11,10 @@
  //-----------------------------------------------------------------------------
  
  #define STRING_GUID(l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) l##-##w1##-##w2##-##b1##b2##-##b3##b4##b5##b6##b7##b8
  
  #if defined(__midl) || defined(GEN_MIDL)
---- include/adoint.h.orig	2005-04-04 18:50:18.000000000 +0900
-+++ include/adoint.h	2007-01-02 17:36:43.593750000 +0900
+--- include/adoint.h.orig	2008-01-18 22:17:10.000000000 +0900
++++ include/adoint.h	2009-08-21 09:21:56.000000000 +0900
 @@ -11,6 +11,9 @@
  //--------------------------------------------------------------------
  #ifndef _ADOINT_H_
  {
      ULONG   cbOID;
 --- include/commctrl.h.orig	2008-01-18 22:17:14.000000000 +0900
-+++ include/commctrl.h	 2009-02-16 21:34:39.065125000 +0900
++++ include/commctrl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -14,6 +14,14 @@
  #ifndef _INC_COMMCTRL
  #define _INC_COMMCTRL
  #if defined(_MSC_VER) && (_MSC_VER >= 1200)
  #pragma warning(push)
  #pragma warning(disable:4001) /* nonstandard extension : single line comment */
-@@ -23,7 +31,7 @@
- 
- #ifndef _HRESULT_DEFINED
- #define _HRESULT_DEFINED
--typedef __success(return >= 0) long HRESULT;
-+typedef long HRESULT;
- #endif // !_HRESULT_DEFINED
- 
- #ifndef NOUSER
 @@ -369,8 +377,10 @@
  
  // Shell reserved               (0U-580U) -  (0U-589U)
  #endif  /* _INC_COMMCTRL */
  
  
---- include/control.h.orig	2005-04-14 17:54:38.000000000 +0900
-+++ include/control.h	2007-01-02 22:16:33.031250000 +0900
+--- include/control.h.orig	2008-01-18 22:17:14.000000000 +0900
++++ include/control.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  
  
  /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/dispex.h.orig	2007-03-31 19:44:54.000000000 +0900
-+++ include/dispex.h	2007-03-24 17:40:20.000000000 +0900
+--- include/dispex.h.orig	2008-01-18 22:17:16.000000000 +0900
++++ include/dispex.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  
  
  /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/filter.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/filter.h	2007-01-02 11:15:03.671875000 +0900
+--- include/filter.h.orig	2008-01-18 22:17:18.000000000 +0900
++++ include/filter.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  
  
  /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/gdiplusbitmap.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusbitmap.h	2007-01-02 11:17:13.125000000 +0900
+--- include/gdiplusbitmap.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusbitmap.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  /**************************************************************************\
  *
  * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusbrush.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusbrush.h	2007-01-02 10:33:22.734375000 +0900
+--- include/gdiplusbrush.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusbrush.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  /**************************************************************************\
  * 
  * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusenums.h.orig	2003-03-26 16:34:34.000000000 +0900
-+++ include/gdiplusenums.h	2004-12-30 20:42:34.000000000 +0900
+--- include/gdiplusenums.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusenums.h	2009-08-21 09:21:56.000000000 +0900
 @@ -542,7 +542,7 @@
  
  #define GDIP_EMFPLUS_RECORD_BASE        0x00004000
  #define GDIP_EMFPLUS_RECORD_TO_WMF(n)   ((n) & (~GDIP_WMF_RECORD_BASE))
  #define GDIP_IS_WMF_RECORDTYPE(n)       (((n) & GDIP_WMF_RECORD_BASE) != 0)
  
---- include/gdiplusfont.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusfont.h	2007-01-02 10:35:57.671875000 +0900
+--- include/gdiplusfont.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusfont.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
          IN HENHMETAFILE       hemf,
          IN UINT               cbData16,     
          OUT LPBYTE            pData16,
---- include/gdiplusimageattributes.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusimageattributes.h	2007-01-02 10:21:23.031250000 +0900
+--- include/gdiplusimageattributes.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusimageattributes.h	2009-08-21 09:21:56.000000000 +0900
 @@ -32,6 +32,9 @@
  
  #ifndef _GDIPLUSIMAGEATTRIBUTES_H
  
  class GpImageAttributes;
  
---- include/gdiplusimaging.h.orig	2003-03-26 16:34:34.000000000 +0900
-+++ include/gdiplusimaging.h	2007-12-04 21:16:38.000000000 +0900
+--- include/gdiplusimaging.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusimaging.h	2009-08-21 09:21:56.000000000 +0900
 @@ -160,7 +160,7 @@
      UINT Width;
      UINT Height;
      VOID* Scan0;
      UINT_PTR Reserved;
  };
---- include/gdiplusmatrix.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusmatrix.h	2007-01-02 10:32:35.203125000 +0900
+--- include/gdiplusmatrix.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusmatrix.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  /**************************************************************************\
  * 
  * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdipluspath.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdipluspath.h	2007-01-02 10:34:33.125000000 +0900
+--- include/gdipluspath.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdipluspath.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  /**************************************************************************\
  *
  * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdipluspen.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdipluspen.h	2007-01-02 10:34:12.593750000 +0900
+--- include/gdipluspen.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdipluspen.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  /**************************************************************************\
  * 
  * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusregion.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusregion.h	2007-01-02 10:35:23.453125000 +0900
+--- include/gdiplusregion.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusregion.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  /**************************************************************************\
  *
  * Copyright (c) 1998-2001, Microsoft Corp.  All Rights Reserved.
---- include/gdiplusstringformat.h.orig	2005-04-14 17:54:44.000000000 +0900
-+++ include/gdiplusstringformat.h	2007-08-29 23:10:06.497500000 +0900
+--- include/gdiplusstringformat.h.orig	2008-01-18 22:17:46.000000000 +0900
++++ include/gdiplusstringformat.h	2009-08-21 09:21:56.000000000 +0900
 @@ -217,7 +217,7 @@
          ));
      }
      {
          StringTrimming trimming;
          SetStatus(DllExports::GdipGetStringFormatTrimming(
---- include/imagehlp.h.orig	2008-03-22 06:10:42.084500000 +1000
-+++ include/imagehlp.h	2009-02-16 21:34:39.065125000 +0900
+--- include/imm.h.orig	2008-01-18 22:17:20.000000000 +0900
++++ include/imm.h	2009-08-21 09:21:56.000000000 +0900
+@@ -7,6 +7,13 @@
+ #ifndef _IMM_
+ #define _IMM_
+ 
++#define __in
++#define __out
++#ifdef __cplusplus
++#define __inline inline
++#else
++#define __inline static __inline__
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -715,5 +722,9 @@
+ }
+ #endif
+ 
++#undef __in
++#undef __out
++#undef __inline
++
+ #endif  // _IMM_
+ 
+--- include/imagehlp.h.orig	2008-01-18 22:17:20.000000000 +0900
++++ include/imagehlp.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
 +
  #endif // _IMAGEHLP_
  
---- include/intsafe.h.orig	2008-03-22 06:10:42.100125000 +1000
-+++ include/intsafe.h	2008-03-24 02:25:53.710750000 +1000
-@@ -111,7 +111,7 @@
- 
- 
- 
--typedef __success(return >= 0) long HRESULT;
-+typedef long HRESULT;
- 
- #define SUCCEEDED(hr)   (((HRESULT)(hr)) >= 0)
- #define FAILED(hr)      (((HRESULT)(hr)) < 0)
-@@ -134,7 +134,7 @@
-     || defined(_M_IA64) || defined(_M_AMD64)
- #define UInt32x32To64(a, b) (((unsigned __int64)((unsigned int)(a))) * ((unsigned __int64)((unsigned int)(b))))
- #elif defined(_M_IX86)
--#define UInt32x32To64(a, b) ((unsigned __int64)(((unsigned __int64)((unsigned int)(a))) * ((unsigned int)(b))))
-+//#define UInt32x32To64(a, b) ((unsigned __int64)(((unsigned __int64)((unsigned int)(a))) * ((unsigned int)(b))))
- #else
- #error Must define a target architecture.
- #endif
-@@ -142,22 +142,22 @@
- //
- // Min/Max type values
- //
--#define INT8_MIN        (-127i8 - 1)
-+#define INT8_MIN        ((signed char)(-127) - 1)
- #define SHORT_MIN       (-32768)
--#define INT16_MIN       (-32767i16 - 1)
--#define INT_MIN         (-2147483647 - 1)
--#define INT32_MIN       (-2147483647i32 - 1)
--#define LONG_MIN        (-2147483647L - 1)
--#define LONGLONG_MIN    (-9223372036854775807i64 - 1)
--#define LONG64_MIN      (-9223372036854775807i64 - 1)
--#define INT64_MIN       (-9223372036854775807i64 - 1)
-+#define INT16_MIN       ((short)(-32767) - 1)
-+//#define INT_MIN         (-2147483647 - 1)
-+#define INT32_MIN       (-2147483647L - 1)
-+//#define LONG_MIN        (-2147483647L - 1)
-+#define LONGLONG_MIN    (-9223372036854775807ll - 1)
-+#define LONG64_MIN      (-9223372036854775807ll - 1)
-+#define INT64_MIN       (-9223372036854775807ll - 1)
- #define INT128_MIN      (-170141183460469231731687303715884105727i128 - 1)
- 
- #ifdef _WIN64
--#define INT_PTR_MIN     (-9223372036854775807i64 - 1)
--#define LONG_PTR_MIN    (-9223372036854775807i64 - 1)
--#define PTRDIFF_T_MIN   (-9223372036854775807i64 - 1)
--#define SSIZE_T_MIN     (-9223372036854775807i64 - 1)
-+#define INT_PTR_MIN     (-9223372036854775807ll - 1)
-+#define LONG_PTR_MIN    (-9223372036854775807ll - 1)
-+#define PTRDIFF_T_MIN   (-9223372036854775807ll - 1)
-+#define SSIZE_T_MIN     (-9223372036854775807ll - 1)
- #else
- #define INT_PTR_MIN     (-2147483647 - 1)
- #define LONG_PTR_MIN    (-2147483647L - 1)
-@@ -165,44 +165,44 @@
- #define SSIZE_T_MIN     (-2147483647L - 1)
- #endif
- 
--#define INT8_MAX        127i8
--#define UINT8_MAX       0xffui8
-+#define INT8_MAX        ((signed char)(127))
-+#define UINT8_MAX       ((unsigned char)(0xff))
- #define BYTE_MAX        0xff
- #define SHORT_MAX       32767
--#define INT16_MAX       32767i16
-+#define INT16_MAX       ((short)(32767))
- #define USHORT_MAX      0xffff
--#define UINT16_MAX      0xffffui16
-+#define UINT16_MAX      ((unsigned short)(0xffff))
- #define WORD_MAX        0xffff
- #define INT_MAX         2147483647
--#define INT32_MAX       2147483647i32
-+#define INT32_MAX       2147483647L
- #define UINT_MAX        0xffffffff
--#define UINT32_MAX      0xffffffffui32
-+#define UINT32_MAX      0xffffffffu
- #define LONG_MAX        2147483647L
- #define ULONG_MAX       0xffffffffUL
- #define DWORD_MAX       0xffffffffUL
--#define LONGLONG_MAX    9223372036854775807i64
--#define LONG64_MAX      9223372036854775807i64
--#define INT64_MAX       9223372036854775807i64
--#define ULONGLONG_MAX   0xffffffffffffffffui64
--#define DWORDLONG_MAX   0xffffffffffffffffui64
--#define ULONG64_MAX     0xffffffffffffffffui64
--#define DWORD64_MAX     0xffffffffffffffffui64
--#define UINT64_MAX      0xffffffffffffffffui64
-+#define LONGLONG_MAX    9223372036854775807ll
-+#define LONG64_MAX      9223372036854775807ll
-+#define INT64_MAX       9223372036854775807ll
-+#define ULONGLONG_MAX   0xffffffffffffffffull
-+#define DWORDLONG_MAX   0xffffffffffffffffull
-+#define ULONG64_MAX     0xffffffffffffffffull
-+#define DWORD64_MAX     0xffffffffffffffffull
-+#define UINT64_MAX      0xffffffffffffffffull
- #define INT128_MAX      170141183460469231731687303715884105727i128
- #define UINT128_MAX     0xffffffffffffffffffffffffffffffffui128
- 
- #undef SIZE_T_MAX
- 
- #ifdef _WIN64
--#define INT_PTR_MAX     9223372036854775807i64
--#define UINT_PTR_MAX    0xffffffffffffffffui64
--#define LONG_PTR_MAX    9223372036854775807i64
--#define ULONG_PTR_MAX   0xffffffffffffffffui64
--#define DWORD_PTR_MAX   0xffffffffffffffffui64
--#define PTRDIFF_T_MAX   9223372036854775807i64
--#define SIZE_T_MAX      0xffffffffffffffffui64
--#define SSIZE_T_MAX     9223372036854775807i64
--#define _SIZE_T_MAX     0xffffffffffffffffui64
-+#define INT_PTR_MAX     9223372036854775807ll
-+#define UINT_PTR_MAX    0xffffffffffffffffull
-+#define LONG_PTR_MAX    9223372036854775807ll
-+#define ULONG_PTR_MAX   0xffffffffffffffffull
-+#define DWORD_PTR_MAX   0xffffffffffffffffull
-+#define PTRDIFF_T_MAX   9223372036854775807ll
-+#define SIZE_T_MAX      0xffffffffffffffffull
-+#define SSIZE_T_MAX     9223372036854775807ll
-+#define _SIZE_T_MAX     0xffffffffffffffffull
- #else
- #define INT_PTR_MAX     2147483647 
- #define UINT_PTR_MAX    0xffffffff
-@@ -219,39 +219,39 @@
- //
- // It is common for -1 to be used as an error value
- //
--#define INT8_ERROR      (-1i8)
--#define UINT8_ERROR     0xffui8
-+#define INT8_ERROR      (((signed char)(-1)))
-+#define UINT8_ERROR     ((unsigned char)(0xff))
- #define BYTE_ERROR      0xff
- #define SHORT_ERROR     (-1)
--#define INT16_ERROR     (-1i16)
-+#define INT16_ERROR     (((short)(-1)))
- #define USHORT_ERROR    0xffff
--#define UINT16_ERROR    0xffffui16
-+#define UINT16_ERROR    ((unsigned short)(0xffff))
- #define WORD_ERROR      0xffff
- #define INT_ERROR       (-1)
--#define INT32_ERROR     (-1i32)
-+#define INT32_ERROR     (-1L)
- #define UINT_ERROR      0xffffffff
--#define UINT32_ERROR    0xffffffffui32
-+#define UINT32_ERROR    0xffffffffuL
- #define LONG_ERROR      (-1L)
- #define ULONG_ERROR     0xffffffffUL
- #define DWORD_ERROR     0xffffffffUL
--#define LONGLONG_ERROR  (-1i64)
--#define LONG64_ERROR    (-1i64)
--#define INT64_ERROR     (-1i64)
--#define ULONGLONG_ERROR 0xffffffffffffffffui64
--#define DWORDLONG_ERROR 0xffffffffffffffffui64
--#define ULONG64_ERROR   0xffffffffffffffffui64
--#define UINT64_ERROR    0xffffffffffffffffui64
--
--#ifdef _WIN64
--#define INT_PTR_ERROR   (-1i64)
--#define UINT_PTR_ERROR  0xffffffffffffffffui64
--#define LONG_PTR_ERROR  (-1i64)
--#define ULONG_PTR_ERROR 0xffffffffffffffffui64
--#define DWORD_PTR_ERROR 0xffffffffffffffffui64
--#define PTRDIFF_T_ERROR (-1i64)
--#define SIZE_T_ERROR    0xffffffffffffffffui64
--#define SSIZE_T_ERROR   (-1i64)
--#define _SIZE_T_ERROR   0xffffffffffffffffui64
-+#define LONGLONG_ERROR  (-1ll)
-+#define LONG64_ERROR    (-1ll)
-+#define INT64_ERROR     (-1ll)
-+#define ULONGLONG_ERROR 0xffffffffffffffffull
-+#define DWORDLONG_ERROR 0xffffffffffffffffull
-+#define ULONG64_ERROR   0xffffffffffffffffull
-+#define UINT64_ERROR    0xffffffffffffffffull
-+
-+#ifdef _WIN64
-+#define INT_PTR_ERROR   (-1ll)
-+#define UINT_PTR_ERROR  0xffffffffffffffffull
-+#define LONG_PTR_ERROR  (-1ll)
-+#define ULONG_PTR_ERROR 0xffffffffffffffffull
-+#define DWORD_PTR_ERROR 0xffffffffffffffffull
-+#define PTRDIFF_T_ERROR (-1ll)
-+#define SIZE_T_ERROR    0xffffffffffffffffull
-+#define SSIZE_T_ERROR   (-1ll)
-+#define _SIZE_T_ERROR   0xffffffffffffffffull
- #else
- #define INT_PTR_ERROR   (-1) 
- #define UINT_PTR_ERROR  0xffffffff
-@@ -7570,13 +7570,13 @@
- 
-             // a * d must be less than 2^32 or there would be bits set in the high 64-bits
-             ad = (((ULONGLONG)dw_a) * (ULONGLONG)dw_d);
--            if ((ad & 0xffffffff00000000) == 0)
-+            if ((ad & 0xffffffff00000000ULL) == 0)
-             {
-                 dw_b = (DWORD)ullMultiplicand;
- 
-                 // b * c must be less than 2^32 or there would be bits set in the high 64-bits
-                 bc = (((ULONGLONG)dw_b) * (ULONGLONG)dw_c);
--                if ((bc & 0xffffffff00000000) == 0)
-+                if ((bc & 0xffffffff00000000ULL) == 0)
-                 {
-                     // now sum them all up checking for overflow.
-                     // shifting is safe because we already checked for overflow above
-@@ -8015,10 +8015,14 @@
- // Macros that are no longer used in this header but which clients may
- // depend on being defined here.
- //
--#define LOWORD(_dw)     ((WORD)(((DWORD_PTR)(_dw)) & 0xffff))
--#define HIWORD(_dw)     ((WORD)((((DWORD_PTR)(_dw)) >> 16) & 0xffff))
-+//#define LOWORD(_dw)     ((WORD)(((DWORD_PTR)(_dw)) & 0xffff))
-+//#define HIWORD(_dw)     ((WORD)((((DWORD_PTR)(_dw)) >> 16) & 0xffff))
- #define LODWORD(_qw)    ((DWORD)(_qw))
- #define HIDWORD(_qw)    ((DWORD)(((_qw) >> 32) & 0xffffffff))
- 
-+#undef __in
-+#undef __out
-+#undef __inline
-+
- #endif // _INTSAFE_H_INCLUDED_
- 
---- include/mapinls.h.orig	2005-04-14 17:54:46.000000000 +0900
-+++ include/mapinls.h	2006-12-30 20:46:11.125000000 +0900
-@@ -72,7 +72,7 @@
- typedef const void FAR *				LPCVOID;
- 
- #ifndef _MAC
--#ifndef LPOLESTR
-+#ifndef OLESTR
- #if !defined (_WIN32)
- 
- #define LPOLESTR        LPSTR
-@@ -88,9 +88,11 @@
- #define OLESTR(str)     L##str
- 
- #endif /* !_WIN32 */
--#endif /* LPOLESTR */
-+#endif /* OLESTR */
- #endif /* _MAC */
- 
-+#ifndef NORM_IGNORECASE
-+
- #define NORM_IGNORECASE      			0x00000001     /* ignore case */
- #define NORM_IGNORENONSPACE  			0x00000002     /* ignore diacritics */
- #define NORM_IGNORESYMBOLS   			0x00000004     /* ignore symbols */
-@@ -103,6 +105,8 @@
- #define NORM_IGNOREKANATYPE				0x00000040		/* ignore kanatype */
- #endif
- 
-+#endif /* NORM_IGNORECASE */
-+
- #if defined(WIN16)
- 
- #define	lstrcpyA						lstrcpy
---- include/mapiwin.h.orig	2003-03-26 16:34:38.000000000 +0900
-+++ include/mapiwin.h	2004-12-28 21:41:14.000000000 +0900
+--- include/mapiwin.h.orig	2008-01-18 22:17:22.000000000 +0900
++++ include/mapiwin.h	2009-08-21 09:21:56.000000000 +0900
 @@ -428,5 +428,5 @@
  #endif
  
 -
 +
  
---- include/msdasc.h.orig	2005-04-04 18:50:18.000000000 +0900
-+++ include/msdasc.h	2007-01-05 21:47:51.515625000 +0900
+--- include/msdasc.h.orig	2008-01-18 22:17:26.000000000 +0900
++++ include/msdasc.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  
  
  /* this ALWAYS GENERATED file contains the definitions for the interfaces */
---- include/multimon.h.orig	2005-04-14 17:54:52.000000000 +0900
-+++ include/multimon.h	2006-12-31 18:00:37.203125000 +0900
+--- include/msi.h.orig	2008-01-18 22:17:28.000000000 +0900
++++ include/msi.h	2009-08-21 09:21:56.000000000 +0900
+@@ -59,6 +59,14 @@
+ #endif // _MSI_NO_CRYPTO
+ #endif //(_WIN32_MSI >= 150)
+ 
++#define __in
++#define __out
++#ifdef __cplusplus
++#define __inline inline
++#else
++#define __inline static __inline__
++#endif
++
+ // --------------------------------------------------------------------------
+ // Installer generic handle definitions
+ // --------------------------------------------------------------------------
+@@ -2248,5 +2256,9 @@
+ // LOCALIZE END
+ 
+ 
++#undef __in
++#undef __out
++#undef __inline
++
+ #endif // _MSI_H_
+ 
+--- include/msiquery.h.orig	2008-01-18 22:17:28.000000000 +0900
++++ include/msiquery.h	2009-08-21 09:21:56.000000000 +0900
+@@ -21,6 +21,14 @@
+ #define _MSIQUERY_H_
+ #include "msi.h"  // INSTALLSTATE
+ 
++#define __in
++#define __out
++#ifdef __cplusplus
++#define __inline inline
++#else
++#define __inline static __inline__
++#endif
++
+ #define MSI_NULL_INTEGER 0x80000000  // integer value reserved for null
+ 
+ // MsiOpenDatabase persist predefine values, otherwise output database path is used
+@@ -1026,5 +1034,9 @@
+ }
+ #endif
+ 
++#undef __in
++#undef __out
++#undef __inline
++
+ #endif // _MSIQUERY_H_
+ 
+--- include/multimon.h.orig	2008-01-18 22:17:30.000000000 +0900
++++ include/multimon.h	2009-08-21 09:21:56.000000000 +0900
 @@ -175,7 +175,7 @@
  
  BOOL IsPlatformNT()
  #endif // __NTQUERY_H__
  
  
---- include/ocidl.h.orig	2008-03-22 06:10:42.272000000 +1000
-+++ include/ocidl.h	2009-02-16 21:34:39.065125000 +0900
+--- include/ocidl.h.orig	2008-01-18 22:17:32.000000000 +0900
++++ include/ocidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  #endif
  
  
---- include/oleauto.h.orig	2008-03-22 06:10:43.225125000 +1000
-+++ include/oleauto.h	2009-02-16 21:34:39.065125000 +0900
+--- include/oleauto.h.orig	2008-01-18 22:17:32.000000000 +0900
++++ include/oleauto.h	2009-08-21 09:21:56.000000000 +0900
 @@ -56,6 +56,14 @@
  /* pull in the MIDL generated header */
  #include <oaidl.h>
  
  /*---------------------------------------------------------------------*/
  /*                            BSTR API                                 */
-@@ -948,6 +956,9 @@
- /*             ICreateTypeLib                                          */
- /*---------------------------------------------------------------------*/
- 
-+typedef interface ICreateTypeLib ICreateTypeLib;
-+typedef interface ICreateTypeLib2 ICreateTypeLib2;
-+typedef interface ICreateTypeInfo ICreateTypeInfo;
- typedef ICreateTypeLib * LPCREATETYPELIB;
- 
- typedef ICreateTypeInfo * LPCREATETYPEINFO;
-@@ -1160,7 +1171,7 @@
+@@ -1160,7 +1168,7 @@
  
  // Declare variant access functions.
  
  #define V_UNION(X, Y)   ((X)->n1.n2.n3.Y)
  #define V_VT(X)         ((X)->n1.n2.vt)
  #define V_RECORDINFO(X) ((X)->n1.n2.n3.brecVal.pRecInfo)
-@@ -1242,5 +1253,9 @@
+@@ -1242,5 +1250,9 @@
  #include <poppack.h>
  #endif // RC_INVOKED
  
 +
  #endif     // __OLEAUTO_H__
  
---- include/oledb.h.orig	2005-04-04 18:50:18.000000000 +0900
-+++ include/oledb.h	2007-01-02 17:16:30.656250000 +0900
+--- include/olectl.h.orig	2008-01-18 22:17:32.000000000 +0900
++++ include/olectl.h	2009-08-21 09:21:56.000000000 +0900
+@@ -28,6 +28,14 @@
+ #include <ocidl.h>
+ #endif // _MAC
+ 
++#define __in
++#define __out
++#ifdef __cplusplus
++#define __inline inline
++#else
++#define __inline static __inline__
++#endif
++
+ #ifdef _OLEAUT32_
+ #define WINOLECTLAPI        STDAPI
+ #define WINOLECTLAPI_(type) STDAPI_(type)
+@@ -616,5 +624,9 @@
+ 
+ #endif // defined(__MKTYPLIB__) || defined(__midl)
+ 
++#undef __in
++#undef __out
++#undef __inline
++
+ #endif // _OLECTL_H_
+ 
+--- include/oledb.h.orig	2008-01-18 22:17:32.000000000 +0900
++++ include/oledb.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  #define _FILETIME_
  typedef struct _FILETIME {
  		DWORD dwLowDateTime;
---- include/oleidl.h.orig	2008-03-22 06:10:42.350125000 +1000
-+++ include/oleidl.h	2009-02-16 21:34:39.065125000 +0900
+--- include/oleidl.h.orig	2008-01-18 22:17:32.000000000 +0900
++++ include/oleidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  
  
 --- include/propidl.h.orig	2008-01-18 22:17:32.000000000 +0900
-+++ include/propidl.h	2009-02-16 21:34:39.065125000 +0900
++++ include/propidl.h	2009-08-21 09:21:56.000000000 +0900
 @@ -76,6 +76,14 @@
  #include "objidl.h"
  #include "oaidl.h"
  #ifdef __cplusplus
  extern "C"{
  #endif 
-@@ -285,11 +293,6 @@
- #define tag_inner_PROPVARIANT
- #endif
+@@ -143,6 +151,7 @@
+     CHAR *pElems;
+     } 	CAC;
  
--#if !defined(_MSC_EXTENSIONS)
--
--struct tagPROPVARIANT;
--
--#else
- #ifndef MIDL_PASS
- struct tagPROPVARIANT {
-   union {
-@@ -316,7 +319,7 @@
-         FLOAT fltVal;
-         DOUBLE dblVal;
-         VARIANT_BOOL boolVal;
--        _VARIANT_BOOL bool;
-+//        _VARIANT_BOOL bool;
-         SCODE scode;
-         CY cyVal;
-         DATE date;
-@@ -384,8 +387,6 @@
- };
- #endif
++#if 0
+ typedef struct tagCAUB
+     {
+     ULONG cElems;
+@@ -268,6 +277,7 @@
+     ULONG cElems;
+     CLSID *pElems;
+     } 	CACLSID;
++#endif
  
--#endif /* _MSC_EXTENSIONS */
--
  #ifdef MIDL_PASS
- // This is the LPPROPVARIANT definition for marshaling.
- typedef struct tag_inner_PROPVARIANT *LPPROPVARIANT;
-@@ -1268,6 +1269,10 @@
+ // This is the PROPVARIANT padding layout for marshaling.
+@@ -509,6 +519,7 @@
+ 
+ #define	PRSPEC_PROPID	( 1 )
+ 
++#if 0
+ typedef struct tagPROPSPEC
+     {
+     ULONG ulKind;
+@@ -526,12 +537,14 @@
+     PROPID propid;
+     VARTYPE vt;
+     } 	STATPROPSTG;
++#endif
+ 
+ // Macros for parsing the OS Version of the Property Set Header
+ #define PROPSETHDR_OSVER_KIND(dwOSVer)      HIWORD( (dwOSVer) )
+ #define PROPSETHDR_OSVER_MAJOR(dwOSVer)     LOBYTE(LOWORD( (dwOSVer) ))
+ #define PROPSETHDR_OSVER_MINOR(dwOSVer)     HIBYTE(LOWORD( (dwOSVer) ))
+ #define PROPSETHDR_OSVERSION_UNKNOWN        0xFFFFFFFF
++#if 0
+ typedef struct tagSTATPROPSETSTG
+     {
+     FMTID fmtid;
+@@ -542,12 +555,14 @@
+     FILETIME atime;
+     DWORD dwOSVersion;
+     } 	STATPROPSETSTG;
++#endif
+ 
+ 
+ 
+ extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_c_ifspec;
+ extern RPC_IF_HANDLE __MIDL_itf_propidl_0000_0000_v0_0_s_ifspec;
+ 
++#if 0
+ #ifndef __IPropertyStorage_INTERFACE_DEFINED__
+ #define __IPropertyStorage_INTERFACE_DEFINED__
+ 
+@@ -1136,6 +1151,7 @@
+ 
+ 
+ #endif 	/* __IEnumSTATPROPSETSTG_INTERFACE_DEFINED__ */
++#endif
+ 
+ 
+ /* interface __MIDL_itf_propidl_0000_0004 */
+@@ -1268,6 +1284,10 @@
  }
  #endif
  
  #endif
  
  
---- include/propsys.h.orig	2008-03-22 06:10:42.412625000 +1000
-+++ include/propsys.h	2009-02-16 21:34:39.065125000 +0900
+--- include/propkeydef.h.orig	2008-01-18 22:17:32.000000000 +0900
++++ include/propkeydef.h	2009-08-21 09:21:56.000000000 +0900
+@@ -2,6 +2,10 @@
+ #define PID_FIRST_USABLE 2
+ #endif
+ 
++#ifndef __MIDL_CONST
++#define __MIDL_CONST const
++#endif
++
+ #ifndef REFPROPERTYKEY
+ #ifdef __cplusplus
+ #define REFPROPERTYKEY const PROPERTYKEY &
+--- include/propsys.h.orig	2008-01-18 22:17:34.000000000 +0900
++++ include/propsys.h	2009-08-21 09:21:56.000000000 +0900
 @@ -228,6 +228,14 @@
  #endif // 0
  #include <propkeydef.h>
  #endif
  
  
---- include/qedit.h.orig	2005-04-14 17:54:56.000000000 +0900
-+++ include/qedit.h	2007-01-02 22:11:05.140625000 +0900
-@@ -1,3 +1,6 @@
-+#if __GNUC__ >=3
-+#pragma GCC system_header
-+#endif
- 
- 
- /* this ALWAYS GENERATED file contains the definitions for the interfaces */
-@@ -6546,10 +6549,10 @@
- #define DEX_IDS_GRAPH_ERROR        1427
- #define DEX_IDS_GRID_ERROR        1428
- #define DEX_IDS_INTERFACE_ERROR    1429
--EXTERN_GUID(CLSID_VideoEffects1Category, 0xcc7bfb42, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
--EXTERN_GUID(CLSID_VideoEffects2Category, 0xcc7bfb43, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
--EXTERN_GUID(CLSID_AudioEffects1Category, 0xcc7bfb44, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
--EXTERN_GUID(CLSID_AudioEffects2Category, 0xcc7bfb45, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
-+DEFINE_GUID(CLSID_VideoEffects1Category, 0xcc7bfb42, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
-+DEFINE_GUID(CLSID_VideoEffects2Category, 0xcc7bfb43, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
-+DEFINE_GUID(CLSID_AudioEffects1Category, 0xcc7bfb44, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
-+DEFINE_GUID(CLSID_AudioEffects2Category, 0xcc7bfb45, 0xf175, 0x11d1, 0xa3, 0x92, 0x0, 0xe0, 0x29, 0x1f, 0x39, 0x59);
- 
- 
- extern RPC_IF_HANDLE __MIDL_itf_qedit_0001_0097_v0_0_c_ifspec;
 --- include/shlobj.h.orig	2008-01-18 22:17:36.000000000 +0900
-+++ include/shlobj.h	2009-02-16 21:34:39.065125000 +0900
++++ include/shlobj.h	2009-08-21 09:21:56.000000000 +0900
 @@ -1,3 +1,6 @@
 +#if __GNUC__ >=3
 +#pragma GCC system_header
  #if defined(_MSC_VER) && (_MSC_VER >= 1200)
  #pragma once
  #endif
-@@ -250,9 +261,10 @@
- #define GIL_FORCENOSHIELD 0x0400      // icon must *not* be "stamped" with the LUA shield
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IExtractIconA;
- #define INTERFACE   IExtractIconA
- 
--DECLARE_INTERFACE_IID_(IExtractIconA, IUnknown, "000214eb-0000-0000-c000-000000000046")
-+DECLARE_INTERFACE_(IExtractIconA, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -278,9 +290,10 @@
- typedef IExtractIconA * LPEXTRACTICONA;
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IExtractIconW;
- #define INTERFACE   IExtractIconW
- 
--DECLARE_INTERFACE_IID_(IExtractIconW, IUnknown, "000214fa-0000-0000-c000-000000000046")
-+DECLARE_INTERFACE_(IExtractIconW, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -350,9 +363,10 @@
- //===========================================================================
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IShellIconOverlayIdentifier;
- #define INTERFACE   IShellIconOverlayIdentifier
- 
--DECLARE_INTERFACE_IID_(IShellIconOverlayIdentifier, IUnknown, "0c6c4200-c589-11d0-999a-00c04fd655e1")
-+DECLARE_INTERFACE_(IShellIconOverlayIdentifier, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -399,9 +413,10 @@
- //===========================================================================
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IShellIconOverlayManager;
- #define INTERFACE   IShellIconOverlayManager
- 
--DECLARE_INTERFACE_IID_(IShellIconOverlayManager, IUnknown, "f10b5e34-dd3b-42a7-aa7d-2f4ec54bb09b")
-+DECLARE_INTERFACE_(IShellIconOverlayManager, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -447,9 +462,10 @@
- //===========================================================================
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IShellIconOverlay;
- #define INTERFACE   IShellIconOverlay
- 
--DECLARE_INTERFACE_IID_(IShellIconOverlay, IUnknown, "7d688a70-c613-11d0-999b-00c04fd655e1")
-+DECLARE_INTERFACE_(IShellIconOverlay, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -636,9 +652,10 @@
- //===========================================================================
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IShellExecuteHookA;
- #define INTERFACE   IShellExecuteHookA
- 
--DECLARE_INTERFACE_IID_(IShellExecuteHookA, IUnknown, "000214f5-0000-0000-c000-000000000046")
-+DECLARE_INTERFACE_(IShellExecuteHookA, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -650,9 +667,10 @@
- };
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IShellExecuteHookW;
- #define INTERFACE   IShellExecuteHookW
- 
--DECLARE_INTERFACE_IID_(IShellExecuteHookW, IUnknown, "000214fb-0000-0000-c000-000000000046")
-+DECLARE_INTERFACE_(IShellExecuteHookW, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -679,9 +697,10 @@
- //===========================================================================
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_IURLSearchHook;
- #define INTERFACE   IURLSearchHook
- 
--DECLARE_INTERFACE_IID_(IURLSearchHook, IUnknown, "ac60f6a0-0fd9-11d0-99cb-00c04fd64497")
-+DECLARE_INTERFACE_(IURLSearchHook, IUnknown)
- {
-     // *** IUnknown methods ***
-     STDMETHOD(QueryInterface) (THIS_ REFIID riid, __out void **ppv) PURE;
-@@ -693,9 +712,10 @@
- };
- 
- #undef  INTERFACE
-+EXTERN_C const IID IID_ISearchContext;
- #define INTERFACE   ISearchContext
- 
--DECLARE_INTERFACE_IID_(ISearchContext, IUnknown, "09F656A2-41AF-480C-88F7-16CC0D164615")
-+DECLARE_INTERFACE_(ISearchContext, IUnknown)
- {