Removing deprecated types in solar.h

classic Classic list List threaded Threaded
14 messages Options
Reply | Threaded
Open this post in threaded view
|

Removing deprecated types in solar.h

Zhang Xiaofei-6
Hi Mikhail, Carsten and all,

I got a number of errors about windows SDK headers when I followed the
compiler's errors to replace the types in tools/source/fsys/comdep.cxx and
it's headers. I cannot find the cause in OOo code and would appreciate if
you can give me some advice, thanks in advance!

Best Regards,
Felix.

###############################################################################
mkout -- version: 1.8
Making:    all_fsys.dpslo
Making:    all_fsys.dpobj
Compiling: tools/source/fsys/wldcrd.cxx
Compiling: tools/source/fsys/fstat.cxx
Compiling: tools/source/fsys/comdep.cxx
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(889) : error C2146:
syntax error : missing";"(before identifier "fRuntimeKeyAvail")
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(889) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(889) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(890) : error C2146:
syntax error : missing";"(before identifier "fLicVerified")
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(890) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(890) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1374) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1495) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1510) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1653) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2293) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2397) : error C2061:
syntax error : identifier"BYTE"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2410) : error C2061:
syntax error : identifier"BYTE"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2450) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2578) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2815) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2818) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2821) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2824) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2827) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2830) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2833) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2836) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3170) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3173) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3179) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3407) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3410) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3416) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4087) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4091) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4283) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4288) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4300) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4304) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4978) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5258) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5288) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5467) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5974) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(6500) : error C2061:
syntax error : identifier"BYTE"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(6506) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(6512) : error C2061:
syntax error : identifier"BYTE"
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(414) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(417) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(863) : error C2146:
syntax error : missing";"(before identifier "fOddPages")
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(863) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(863) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(864) : error C2146:
syntax error : missing";"(before identifier "fEvenPages")
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(864) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(864) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\docobj.h(1497) : error C2061:
syntax error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3834) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3837) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3855) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3858) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3861) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3864) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3867) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(6554) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(7002) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(7005) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(7011) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shtypes.h(107) : error C2146: syntax
error : missing";"(before identifier "abID")
d:/Env/MICROS~1/Windows/v6.1/include\shtypes.h(107) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shtypes.h(107) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(384) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(394) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(538) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(544) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(555) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(1072) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(1079) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(1638) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(2301) : error
C2061: syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\propsys.h(1709) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\propsys.h(3401) : error C2061:
syntax error : identifier"BOOL"
d:\env\microsoft sdks\windows\v6.1\include\propsys.h(3412) : error C2061:
syntax error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(2513) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(2657) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(4262) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(6930) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(7010) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(7369) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(7962) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(9488) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(10942) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(12676) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(12679) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(13020) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(14274) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(14282) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(14944) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(15145) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(21409) : error C2146: syntax
error : missing";"(before identifier "rgb")
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(21409) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(21409) : error C4430:
missing type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(23201) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(24545) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(24551) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(24849) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(26252) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(26652) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(26873) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(27552) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(416) : error C2061: syntax
error : identifier"BOOL"
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(557) : error C2146: syntax
error : missing";"(before identifier "bFullScreen")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(557) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(557) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(558) : error C2146: syntax
error : missing";"(before identifier "bQuickEdit")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(558) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(558) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(559) : error C2146: syntax
error : missing";"(before identifier "bInsertMode")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(559) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(559) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(560) : error C2146: syntax
error : missing";"(before identifier "bAutoPosition")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(560) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(560) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(563) : error C2146: syntax
error : missing";"(before identifier "bHistoryNoDup")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(563) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(563) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1044) : error C2143: syntax
error : missing";"(在"__stdcall")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1044) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1044) : error C4430: missing
type specifier - assumed int。Note: C++ does not support default-int
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1048) : error C2143: syntax
error : missing";"(在"__stdcall")
d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1048) : fatal error C1003:
error count exceeds100; stopping compilation
dmake:  Error code 2, while making '../../wntmsci12.pro/obj/comdep.obj'


I
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Carsten Driesner
Am 21.06.2010 09:54, schrieb Zhang Xiaofei:
> Hi Mikhail, Carsten and all,
>
> I got a number of errors about windows SDK headers when I followed the
> compiler's errors to replace the types in tools/source/fsys/comdep.cxx and
> it's headers. I cannot find the cause in OOo code and would appreciate if
> you can give me some advice, thanks in advance!
>    
Hi Felix,

Could you please tell us what changes you made when you encountered that
problem? It could be that Windows headers are included which need other
Windows headers. At least BOOL ist defined by the Windows header
(windows.h) and shouldn't be an unknown identifier. But this could also
be related to changes you did. Your job is to exchange all types in
OpenOffice.org headers which conflict with Windows types, e.g. BOOL in
tools/inc/tools/solar.h and Windows.h.

Regards,
Carsten


> Best Regards,
> Felix.
>
> ###############################################################################
> mkout -- version: 1.8
> Making:    all_fsys.dpslo
> Making:    all_fsys.dpobj
> Compiling: tools/source/fsys/wldcrd.cxx
> Compiling: tools/source/fsys/fstat.cxx
> Compiling: tools/source/fsys/comdep.cxx
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(889) : error C2146:
> syntax error : missing";"(before identifier "fRuntimeKeyAvail")
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(889) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(889) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(890) : error C2146:
> syntax error : missing";"(before identifier "fLicVerified")
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(890) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(890) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1374) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1495) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1510) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(1653) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2293) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2397) : error C2061:
> syntax error : identifier"BYTE"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2410) : error C2061:
> syntax error : identifier"BYTE"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2450) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2578) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2815) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2818) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2821) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2824) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2827) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2830) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2833) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(2836) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3170) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3173) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3179) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3407) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3410) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(3416) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4087) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4091) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4283) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4288) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4300) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4304) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(4978) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5258) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5288) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5467) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(5974) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(6500) : error C2061:
> syntax error : identifier"BYTE"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(6506) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\ocidl.h(6512) : error C2061:
> syntax error : identifier"BYTE"
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(414) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(417) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(863) : error C2146:
> syntax error : missing";"(before identifier "fOddPages")
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(863) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(863) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(864) : error C2146:
> syntax error : missing";"(before identifier "fEvenPages")
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(864) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(864) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\docobj.h(1497) : error C2061:
> syntax error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3834) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3837) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3855) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3858) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3861) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3864) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\exdisp.h(3867) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(6554) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(7002) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(7005) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shldisp.h(7011) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shtypes.h(107) : error C2146: syntax
> error : missing";"(before identifier "abID")
> d:/Env/MICROS~1/Windows/v6.1/include\shtypes.h(107) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shtypes.h(107) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(384) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(394) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(538) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(544) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(555) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(1072) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(1079) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(1638) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\structuredquery.h(2301) : error
> C2061: syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\propsys.h(1709) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\propsys.h(3401) : error C2061:
> syntax error : identifier"BOOL"
> d:\env\microsoft sdks\windows\v6.1\include\propsys.h(3412) : error C2061:
> syntax error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(2513) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(2657) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(4262) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(6930) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(7010) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(7369) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(7962) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(9488) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(10942) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(12676) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(12679) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(13020) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(14274) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(14282) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(14944) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(15145) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(21409) : error C2146: syntax
> error : missing";"(before identifier "rgb")
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(21409) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(21409) : error C4430:
> missing type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(23201) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(24545) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(24551) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(24849) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(26252) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(26652) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(26873) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shobjidl.h(27552) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(416) : error C2061: syntax
> error : identifier"BOOL"
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(557) : error C2146: syntax
> error : missing";"(before identifier "bFullScreen")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(557) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(557) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(558) : error C2146: syntax
> error : missing";"(before identifier "bQuickEdit")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(558) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(558) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(559) : error C2146: syntax
> error : missing";"(before identifier "bInsertMode")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(559) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(559) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(560) : error C2146: syntax
> error : missing";"(before identifier "bAutoPosition")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(560) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(560) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(563) : error C2146: syntax
> error : missing";"(before identifier "bHistoryNoDup")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(563) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(563) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1044) : error C2143: syntax
> error : missing";"(在"__stdcall")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1044) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1044) : error C4430: missing
> type specifier - assumed int。Note: C++ does not support default-int
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1048) : error C2143: syntax
> error : missing";"(在"__stdcall")
> d:/Env/MICROS~1/Windows/v6.1/include\shlobj.h(1048) : fatal error C1003:
> error count exceeds100; stopping compilation
> dmake:  Error code 2, while making '../../wntmsci12.pro/obj/comdep.obj'
>
>
> I
>
>    


--
Sitz der Gesellschaft:
Sun Microsystems GmbH, Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht München: HRB 161028
Geschäftsführer: Jürgen Kunz


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Zhang Xiaofei-6


On Mon, Jun 21, 2010 at 7:55 PM, Carsten Driesner <[hidden email]> wrote:
Am 21.06.2010 09:54, schrieb Zhang Xiaofei:

Hi Mikhail, Carsten and all,

I got a number of errors about windows SDK headers when I followed the
compiler's errors to replace the types in tools/source/fsys/comdep.cxx and
it's headers. I cannot find the cause in OOo code and would appreciate if
you can give me some advice, thanks in advance!
 
Hi Felix,

Could you please tell us what changes you made when you encountered that problem? It could be that Windows headers are included which need other Windows headers. At least BOOL ist defined by the Windows header (windows.h) and shouldn't be an unknown identifier. But this could also be related to changes you did. Your job is to exchange all types in OpenOffice.org headers which conflict with Windows types, e.g. BOOL in tools/inc/tools/solar.h and Windows.h.

Hi Carsten,
Thanks for the reply. Till now all the changes are just type replacing in tools module. I'm attaching the changes as a patch. Could you have a look at it if you get time please?

Thanks and Best Regards,
Felix.

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Mathias Bauer
Hi,

On 06/22/2010 11:38 AM, Zhang Xiaofei wrote:

>
>
> On Mon, Jun 21, 2010 at 7:55 PM, Carsten Driesner
> <[hidden email] <mailto:[hidden email]>> wrote:
>
>     Am 21.06.2010 09:54, schrieb Zhang Xiaofei:
>
>         Hi Mikhail, Carsten and all,
>
>         I got a number of errors about windows SDK headers when I
>         followed the
>         compiler's errors to replace the types in
>         tools/source/fsys/comdep.cxx and
>         it's headers. I cannot find the cause in OOo code and would
>         appreciate if
>         you can give me some advice, thanks in advance!
>
>     Hi Felix,
>
>     Could you please tell us what changes you made when you encountered
>     that problem? It could be that Windows headers are included which
>     need other Windows headers. At least BOOL ist defined by the Windows
>     header (windows.h) and shouldn't be an unknown identifier. But this
>     could also be related to changes you did. Your job is to exchange
>     all types in OpenOffice.org headers which conflict with Windows
>     types, e.g. BOOL in tools/inc/tools/solar.h and Windows.h.
>
> Hi Carsten,
> Thanks for the reply. Till now all the changes are just type replacing
> in tools module. I'm attaching the changes as a patch. Could you have a
> look at it if you get time please?

I don't see an attachment. Perhaps it got stripped.

What is your plan with regard to "BOOL"? Will you just replace every
BOOL by a sal_Bool or will you try to use "bool" as much as possible?
The first option is a safe operation and so it would be the fastest way,
the second one looks just "right", but surely is more work to do.

Best regards,
Mathias

--
Mathias Bauer (mba) - Project Lead OpenOffice.org Writer
OpenOffice.org Engineering at Sun: http://blogs.sun.com/GullFOSS
Please don't reply to "[hidden email]".
I use it for the OOo lists and only rarely read other mails sent to it.

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Zhang Xiaofei-6
Hi Mathias

On Fri, Jun 25, 2010 at 4:53 PM, Mathias Bauer <[hidden email]> wrote:

> Hi,
>
>
> On 06/22/2010 11:38 AM, Zhang Xiaofei wrote:
>
>>
>>
>> On Mon, Jun 21, 2010 at 7:55 PM, Carsten Driesner
>> <[hidden email] <mailto:[hidden email]>> wrote:
>>
>>    Am 21.06.2010 09:54, schrieb Zhang Xiaofei:
>>
>>        Hi Mikhail, Carsten and all,
>>
>>        I got a number of errors about windows SDK headers when I
>>        followed the
>>        compiler's errors to replace the types in
>>        tools/source/fsys/comdep.cxx and
>>        it's headers. I cannot find the cause in OOo code and would
>>        appreciate if
>>        you can give me some advice, thanks in advance!
>>
>>    Hi Felix,
>>
>>    Could you please tell us what changes you made when you encountered
>>    that problem? It could be that Windows headers are included which
>>    need other Windows headers. At least BOOL ist defined by the Windows
>>    header (windows.h) and shouldn't be an unknown identifier. But this
>>    could also be related to changes you did. Your job is to exchange
>>    all types in OpenOffice.org headers which conflict with Windows
>>    types, e.g. BOOL in tools/inc/tools/solar.h and Windows.h.
>>
>> Hi Carsten,
>> Thanks for the reply. Till now all the changes are just type replacing
>> in tools module. I'm attaching the changes as a patch. Could you have a
>> look at it if you get time please?
>>
>
> I don't see an attachment. Perhaps it got stripped.
>
> What is your plan with regard to "BOOL"? Will you just replace every BOOL
> by a sal_Bool or will you try to use "bool" as much as possible? The first
> option is a safe operation and so it would be the fastest way, the second
> one looks just "right", but surely is more work to do.
>

Thanks for your attention. As in previous discussions with Carsten and
Mikhail, the plan will take the sal_Bool option. And sorry about the
stripped patch. The latest changes can be found at
http://hg.services.openoffice.org/cws/removetooltypes01/rev/69f6f827fb66 ,
which only includes the BOOL part of the original patch, but I haven't
overpass the same error yet. I will appreciate if anyone concerned can give
me some advice on it. Thanks very much in advance.

Best Regards,
Felix.
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Zhang Xiaofei-6
Hi Mikhail,

I have tried to introduce WTypes.h instead of windows.h
in tools/source/fsys/comdep.hxx, but the result was the same. Could you give
me further advice please?

Best Regards,
Felix.

P.S. Short story for people who are interested but didn't see the
discussions in irc: I removed all the deprecated types in
tools/inc/tools/solar.h and is now replacing them with the sal types, this
compiles well until I came to tools/source/fsys/comdep.cxx and gets the
errors in the original post. By introducing windows.h into comdep.hxx
eliminates the errors but ends with the new ones:

build -- version: 275224


=============
Building module tools
=============

Entering /cygdrive/g/removetooltypes01/tools/inc


Entering /cygdrive/g/removetooltypes01/tools/source/fsys

Compiling: tools/source/fsys/comdep.cxx

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(579) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(579) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(579) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(583) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(583) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(583) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(591) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(591) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(591) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(629) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(629) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(629) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(638) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(638) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(638) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(641) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(641) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(641) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(643) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(643) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(643) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(645) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(645) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(645) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(659) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(659) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(659) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(662) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(662) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(662) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(664) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(664) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(664) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(665) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(665) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(665) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(666) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(666) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(666) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(667) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(667) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(667) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C2146: syntax
error : missing ';' before identifier “fShow”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : warning C4229:
anachronism used : modifiers on data are ignored

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C2059: syntax
error : “)”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(679) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(679) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(679) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(704) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(704) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(704) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(705) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(705) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(705) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(706) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(706) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(706) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2357) : error C2146: syntax
error : missing ';' beforeidentifier“fChanged”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2357) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2357) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2883) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2883) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2883) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3047) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3047) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3047) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3050) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6382) : error C2146: syntax
error : missing ';' beforeidentifier“fChanged”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6382) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6382) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6390) : error C2146: syntax
error : missing ';' beforeidentifier“fChanged”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6390) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6390) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8242) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8290) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8290) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8290) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8298) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8298) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8298) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8299) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8299) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8299) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8309) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8309) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8309) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8310) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8310) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8310) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8342) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8342) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8342) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8351) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8351) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8351) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8359) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8359) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8359) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8361) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8361) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8361) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8375) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8375) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8375) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C2146: syntax
error : missing ';' beforeidentifier“DPA_Sort”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C2433:
“WIN_BOOL”: "inline" not permitted on data declarations.

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C2732: linkage
specification contradicts earlier specification for “WIN_BOOL”

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : see
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8378) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8378) : error C2733: second
C linkage of overloaded function 'DPA_Sort”' not allowed.

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : see
declaration of “DPA_Sort”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C2146: syntax
error : missing ';' beforeidentifier“DPA_Merge”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C2433:
“WIN_BOOL”: "inline" not permitted on data declarations.

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C2732: linkage
specification contradicts earlier specification for “WIN_BOOL”

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : see
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8451) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8451) : error C2733: second
C linkage of overloaded function 'DPA_Merge”' not allowed.

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : see
declaration of “DPA_Merge”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8546) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8546) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8546) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8548) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8592) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8594) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8597) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C2061: syntax
error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : error C2143: syntax
error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : warning C4273:
“WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous
declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : error C4430: error
C4430: missing type specifier - int assumed. Note: C++ does not support
default-int

../../inc\tools/postwin.h(250) : error C2143: syntax error : missing ';'
before“__stdcall”)

../../inc\tools/postwin.h(250) : error C4430: error C4430: missing type
specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(250) : error C4430: error C4430: missing type
specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(251) : error C2143: syntax error : missing ';'
before“__stdcall”)

../../inc\tools/postwin.h(251) : error C4430: error C4430: missing type
specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(251) : error C2086: “int WIN_BOOL”: redefinition

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see
declaration of “WIN_BOOL”

../../inc\tools/postwin.h(251) : error C4430: error C4430: missing type
specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(252) : error C2143: syntax error : missing ';'
before“__stdcall”)

../../inc\tools/postwin.h(252) : error C4430: error C4430: missing type
specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(252) : error C2086: “int WIN_BOOL”: redefinition

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see
declaration of “WIN_BOOL”

../../inc\tools/postwin.h(252) : error C4430: error C4430: missing type
specifier - int assumed. Note: C++ does not support default-int

dmake:  Error code 2, while making '../../wntmsci12.pro/obj/comdep.obj'
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Mikhail Voytenko
Hi Felix,

please try to apply the attached patch in addition to your changes. The problem is that pre*.hxx and post*.hxx include files are intended to workaround the existence of system types in solar.h in case a system file has to be included, in those cases the system types were used with WIN_ prefix. So the header files have to be adjusted as well, and as result the files that have used system types with WIN_ prefix should use the system types directly. For example BOOL replaces WIN_BOOL, at the same time sal_Bool replaces BOOL. Of course each case should be checked carefully.

Hope that helps.

Best regards,
Mikhail.

PS: The OOo mailing list throws the attachments away, so I add your e-mail address in To field to send the email directly also.

On 07/07/10 11:33, Zhang Xiaofei wrote:
Hi Mikhail,

I have tried to introduce WTypes.h instead of windows.h in tools/source/fsys/comdep.hxx, but the result was the same. Could you give me further advice please?

Best Regards,
Felix.

P.S. Short story for people who are interested but didn't see the discussions in irc: I removed all the deprecated types in tools/inc/tools/solar.h and is now replacing them with the sal types, this compiles well until I came to tools/source/fsys/comdep.cxx and gets the errors in the original post. By introducing windows.h into comdep.hxx eliminates the errors but ends with the new ones:

build -- version: 275224


=============
Building module tools
=============

Entering /cygdrive/g/removetooltypes01/tools/inc


Entering /cygdrive/g/removetooltypes01/tools/source/fsys

Compiling: tools/source/fsys/comdep.cxx

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(579) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(579) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(579) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(583) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(583) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(583) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(591) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(591) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(591) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(629) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(629) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(629) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(638) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(638) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(638) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(641) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(641) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(641) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(643) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(643) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(643) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(645) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(645) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(645) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(659) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(659) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(659) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(662) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(662) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(662) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(664) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(664) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(664) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(665) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(665) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(665) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(666) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(666) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(666) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(667) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(667) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(667) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C2146: syntax error : missing ';' before identifier “fShow”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : warning C4229: anachronism used : modifiers on data are ignored 

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(669) : error C2059: syntax error : “)”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(679) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(679) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(679) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(704) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(704) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(704) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(705) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(705) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(705) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(706) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(706) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(706) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2357) : error C2146: syntax error : missing ';' beforeidentifier“fChanged”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2357) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2357) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2883) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2883) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(2883) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3047) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3047) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3047) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(3050) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6382) : error C2146: syntax error : missing ';' beforeidentifier“fChanged”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6382) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6382) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6390) : error C2146: syntax error : missing ';' beforeidentifier“fChanged”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6390) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(6390) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8242) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8290) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8290) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8290) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8298) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8298) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8298) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8299) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8299) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8299) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8309) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8309) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8309) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8310) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8310) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8310) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8342) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8342) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8342) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8351) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8351) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8351) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8359) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8359) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8359) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8361) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8361) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8361) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8375) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8375) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8375) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C2146: syntax error : missing ';' beforeidentifier“DPA_Sort”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C2433: “WIN_BOOL”: "inline" not permitted on data declarations.

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : error C2732: linkage specification contradicts earlier specification for “WIN_BOOL”

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : see declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8378) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8378) : error C2733: second C linkage of overloaded function 'DPA_Sort”' not allowed.

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8377) : see declaration of “DPA_Sort”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8448) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C2146: syntax error : missing ';' beforeidentifier“DPA_Merge”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C2433: “WIN_BOOL”: "inline" not permitted on data declarations.

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : error C2732: linkage specification contradicts earlier specification for “WIN_BOOL”

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : see declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8451) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8451) : error C2733: second C linkage of overloaded function 'DPA_Merge”' not allowed.

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8450) : see declaration of “DPA_Merge”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8496) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8546) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8546) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8546) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8548) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8575) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8576) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8578) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8579) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8584) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8592) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8594) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8597) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C2061: syntax error : identifier“WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8598) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : error C2143: syntax error : missing ';' before“__stdcall”)

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : warning C4273: “WIN_BOOL”: nconsistent dll linkage

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see previous declaration of “WIN_BOOL”

d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(8601) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(250) : error C2143: syntax error : missing ';' before“__stdcall”)

../../inc\tools/postwin.h(250) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(250) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(251) : error C2143: syntax error : missing ';' before“__stdcall”)

../../inc\tools/postwin.h(251) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(251) : error C2086: “int WIN_BOOL”: redefinition

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see declaration of “WIN_BOOL”

../../inc\tools/postwin.h(251) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(252) : error C2143: syntax error : missing ';' before“__stdcall”)

../../inc\tools/postwin.h(252) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

../../inc\tools/postwin.h(252) : error C2086: “int WIN_BOOL”: redefinition

        d:/Env/MICROS~1/Windows/v6.1/include\commctrl.h(165) : see declaration of “WIN_BOOL”

../../inc\tools/postwin.h(252) : error C4430: error C4430: missing type specifier - int assumed. Note: C++ does not support default-int

dmake:  Error code 2, while making '../../wntmsci12.pro/obj/comdep.obj'






-- 
Mikhail Voytenko | Oracle Office Development
Oracle Office GBU

ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55 | 20097 Hamburg

ORACLE Deutschland B.V. & Co. KG
Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603

Komplementärin: ORACLE Deutschland Verwaltung B.V.
Rijnzathe 6, 3454PV De Meern, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Jürgen Kunz, Marcel van de Molen, Alexander van der Ven


diff -r 69f6f827fb66 tools/inc/tools/presys.h
--- a/tools/inc/tools/presys.h Mon Jun 28 18:35:24 2010 +0800
+++ b/tools/inc/tools/presys.h Fri Jul 16 13:27:41 2010 +0200
@@ -32,9 +32,6 @@
 
 #if defined WNT
 
-#define BOOL         WIN_BOOL
-#define BYTE         WIN_BYTE
-
 #define Rectangle    BLA_Rectangle
 #define Polygon      BLA_Polygon
 #define PolyPolygon  BLA_PolyPolygon
diff -r 69f6f827fb66 tools/inc/tools/prewin.h
--- a/tools/inc/tools/prewin.h Mon Jun 28 18:35:24 2010 +0800
+++ b/tools/inc/tools/prewin.h Fri Jul 16 13:27:41 2010 +0200
@@ -29,15 +29,6 @@
 
 #if defined WNT
 
-#define BOOL         WIN_BOOL
-#define BYTE         WIN_BYTE
-#ifndef VCL_NEED_BASETSD
-#define INT64     WIN_INT64
-#define UINT64     WIN_UINT64
-#define INT32     WIN_INT32
-#define UINT32     WIN_UINT32
-#endif
-
 #define Rectangle    BLA_Rectangle
 #define Polygon      BLA_Polygon
 #define PolyPolygon  BLA_PolyPolygon
diff -r 69f6f827fb66 tools/inc/tools/prex.h
--- a/tools/inc/tools/prex.h Mon Jun 28 18:35:24 2010 +0800
+++ b/tools/inc/tools/prex.h Fri Jul 16 13:27:41 2010 +0200
@@ -29,7 +29,7 @@
 #define _PREX_H
 
 #define Window XLIB_Window
-#define BYTE XLIB_BYTE
+#define sal_uInt8 XLIB_BYTE
 #define INT8 XLIB_INT8
 #define INT64       XLIB_INT64
 #define BOOL XLIB_BOOL


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Zhang Xiaofei-6
Hi Mikhail,

I'm trying to push the changes to hg but is getting the following message:
############ output ##############
$ hg push ssh://[hidden email]/cws/removetooltypes01
Enter passphrase for key '/home/zxf/.ssh/id_dsa':
pushing to ssh://[hidden email]/cws/removetooltypes01
searching for changes
abort: push creates new remote branches!
(did you forget to merge? use push -f to force)
remote: OpenSSH_4.6p1, OpenSSL 0.9.8e 23 Feb 2007
remote: debug1: Connecting to hg.services.openoffice.org [12.184.192.15]
port 22
.
remote: debug1: Connection established.
remote: debug1: identity file /home/zxf/.ssh/id_dsa type 2
remote: debug1: Remote protocol version 2.0, remote software version
Sun_SSH_1.1

remote: debug1: no match: Sun_SSH_1.1
remote: debug1: Enabling compatibility mode for protocol 2.0
remote: debug1: Local version string SSH-2.0-OpenSSH_4.6
remote: debug1: SSH2_MSG_KEXINIT sent
remote: debug1: SSH2_MSG_KEXINIT received
remote: debug1: kex: server->client aes128-cbc hmac-md5 zlib
remote: debug1: kex: client->server aes128-cbc hmac-md5 zlib
remote: debug1: SSH2_MSG_KEX_DH_GEX_REQUEST(1024<1024<8192) sent
remote: debug1: expecting SSH2_MSG_KEX_DH_GEX_GROUP
remote: debug1: SSH2_MSG_KEX_DH_GEX_INIT sent
remote: debug1: expecting SSH2_MSG_KEX_DH_GEX_REPLY
remote: debug1: Host 'hg.services.openoffice.org' is known and matches the
RSA h
ost key.
remote: debug1: Found key in /home/zxf/.ssh/known_hosts:3
remote: debug1: ssh_rsa_verify: signature correct
remote: debug1: Enabling compression at level 6.
remote: debug1: SSH2_MSG_NEWKEYS sent
remote: debug1: expecting SSH2_MSG_NEWKEYS
remote: debug1: SSH2_MSG_NEWKEYS received
remote: debug1: SSH2_MSG_SERVICE_REQUEST sent
remote: debug1: SSH2_MSG_SERVICE_ACCEPT received
remote: debug1: Authentications that can continue:
gssapi-keyex,gssapi-with-mic,
publickey,password,keyboard-interactive
remote: debug1: Next authentication method: publickey
remote: debug1: Offering public key: /home/zxf/.ssh/id_dsa
remote: debug1: Remote: Forced command: cd /zpool/hg/ooo/repositories &&
/usr/lo
cal/bin/hg-ssh cws/*
remote: debug1: Remote: Port forwarding disabled.
remote: debug1: Remote: Agent forwarding disabled.
remote: debug1: Remote: X11 forwarding disabled.
remote: debug1: Remote: Pty allocation disabled.
remote: debug1: Server accepts key: pkalg ssh-dss blen 433
remote: debug1: PEM_read_PrivateKey failed
remote: debug1: read PEM private key done: type <unknown>
remote: debug1: read PEM private key done: type DSA
remote: debug1: Remote: Forced command: cd /zpool/hg/ooo/repositories &&
/usr/lo
cal/bin/hg-ssh cws/*
remote: debug1: Remote: Port forwarding disabled.
remote: debug1: Remote: Agent forwarding disabled.
remote: debug1: Remote: X11 forwarding disabled.
remote: debug1: Remote: Pty allocation disabled.
remote: debug1: Authentication succeeded (publickey).
remote: debug1: channel 0: new [client-session]
remote: debug1: Entering interactive session.
remote: debug1: Sending command: hg -R cws/removetooltypes01 serve --stdio
remote: debug1: client_input_channel_req: channel 0 rtype exit-status reply
0
remote: debug1: channel 0: free: client-session, nchannels 1
remote: debug1: Transferred: stdin 0, stdout 0, stderr 0 bytes in 11.4
seconds
remote: debug1: Bytes per second: stdin 0.0, stdout 0.0, stderr 0.0
remote: debug1: Exit status 0
remote: debug1: compress outgoing: raw data 1304, compressed 709, factor
0.54
remote: debug1: compress incoming: raw data 1187, compressed 901, factor
0.76
############ output ##############

So I tried to merge the changeset and got:
############ output ##############
$ hg pull http://hg.services.openoffice.org/cws/removetooltypes01
pulling from http://hg.services.openoffice.org/cws/removetooltypes01
searching for changes
no changes found
$ hg merge
abort: outstanding uncommitted changes
############ output ##############

I'm not sure if this is because I did hg commit locally *before* pushing the
code, but it worked last time.
May I have your advice please? Thanks very much in advance.

Thanks and Best Regards,
Felix.
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Mikhail Voytenko-2
Hi Felix,

I would suggest to do "hg status" to see which files were changed, and
commit them explicitly if the changes are OK. After that please try "hg
merge".

By the way, the situation looks to be quite strange, since you are the
only one who works on this cws. So there should be nothing to "pull", if
you work from the same hg-repository always. And there should be no
additional heads.
Could you please do "hg heads" and send the output.

Best regards,
Mikhail.


On 07/29/10 12:02, Zhang Xiaofei wrote:

> Hi Mikhail,
>
> I'm trying to push the changes to hg but is getting the following message:
> ############ output ##############
> $ hg push ssh://[hidden email]/cws/removetooltypes01
> <http://hg@.../cws/removetooltypes01>
> Enter passphrase for key '/home/zxf/.ssh/id_dsa':
> pushing to ssh://[hidden email]/cws/removetooltypes01
> <http://hg@.../cws/removetooltypes01>
> searching for changes
> abort: push creates new remote branches!
> (did you forget to merge? use push -f to force)
> remote: OpenSSH_4.6p1, OpenSSL 0.9.8e 23 Feb 2007
> remote: debug1: Connecting to hg.services.openoffice.org
> <http://hg.services.openoffice.org> [12.184.192.15] port 22
> .
> remote: debug1: Connection established.
> remote: debug1: identity file /home/zxf/.ssh/id_dsa type 2
> remote: debug1: Remote protocol version 2.0, remote software version
> Sun_SSH_1.1
>
> remote: debug1: no match: Sun_SSH_1.1
> remote: debug1: Enabling compatibility mode for protocol 2.0
> remote: debug1: Local version string SSH-2.0-OpenSSH_4.6
> remote: debug1: SSH2_MSG_KEXINIT sent
> remote: debug1: SSH2_MSG_KEXINIT received
> remote: debug1: kex: server->client aes128-cbc hmac-md5 zlib
> remote: debug1: kex: client->server aes128-cbc hmac-md5 zlib
> remote: debug1: SSH2_MSG_KEX_DH_GEX_REQUEST(1024<1024<8192) sent
> remote: debug1: expecting SSH2_MSG_KEX_DH_GEX_GROUP
> remote: debug1: SSH2_MSG_KEX_DH_GEX_INIT sent
> remote: debug1: expecting SSH2_MSG_KEX_DH_GEX_REPLY
> remote: debug1: Host 'hg.services.openoffice.org
> <http://hg.services.openoffice.org>' is known and matches the RSA h
> ost key.
> remote: debug1: Found key in /home/zxf/.ssh/known_hosts:3
> remote: debug1: ssh_rsa_verify: signature correct
> remote: debug1: Enabling compression at level 6.
> remote: debug1: SSH2_MSG_NEWKEYS sent
> remote: debug1: expecting SSH2_MSG_NEWKEYS
> remote: debug1: SSH2_MSG_NEWKEYS received
> remote: debug1: SSH2_MSG_SERVICE_REQUEST sent
> remote: debug1: SSH2_MSG_SERVICE_ACCEPT received
> remote: debug1: Authentications that can continue:
> gssapi-keyex,gssapi-with-mic,
> publickey,password,keyboard-interactive
> remote: debug1: Next authentication method: publickey
> remote: debug1: Offering public key: /home/zxf/.ssh/id_dsa
> remote: debug1: Remote: Forced command: cd /zpool/hg/ooo/repositories
> && /usr/lo
> cal/bin/hg-ssh cws/*
> remote: debug1: Remote: Port forwarding disabled.
> remote: debug1: Remote: Agent forwarding disabled.
> remote: debug1: Remote: X11 forwarding disabled.
> remote: debug1: Remote: Pty allocation disabled.
> remote: debug1: Server accepts key: pkalg ssh-dss blen 433
> remote: debug1: PEM_read_PrivateKey failed
> remote: debug1: read PEM private key done: type <unknown>
> remote: debug1: read PEM private key done: type DSA
> remote: debug1: Remote: Forced command: cd /zpool/hg/ooo/repositories
> && /usr/lo
> cal/bin/hg-ssh cws/*
> remote: debug1: Remote: Port forwarding disabled.
> remote: debug1: Remote: Agent forwarding disabled.
> remote: debug1: Remote: X11 forwarding disabled.
> remote: debug1: Remote: Pty allocation disabled.
> remote: debug1: Authentication succeeded (publickey).
> remote: debug1: channel 0: new [client-session]
> remote: debug1: Entering interactive session.
> remote: debug1: Sending command: hg -R cws/removetooltypes01 serve --stdio
> remote: debug1: client_input_channel_req: channel 0 rtype exit-status
> reply 0
> remote: debug1: channel 0: free: client-session, nchannels 1
> remote: debug1: Transferred: stdin 0, stdout 0, stderr 0 bytes in 11.4
> seconds
> remote: debug1: Bytes per second: stdin 0.0, stdout 0.0, stderr 0.0
> remote: debug1: Exit status 0
> remote: debug1: compress outgoing: raw data 1304, compressed 709,
> factor 0.54
> remote: debug1: compress incoming: raw data 1187, compressed 901,
> factor 0.76
> ############ output ##############
>
> So I tried to merge the changeset and got:
> ############ output ##############
> $ hg pull http://hg.services.openoffice.org/cws/removetooltypes01
> pulling from http://hg.services.openoffice.org/cws/removetooltypes01
> searching for changes
> no changes found
> $ hg merge
> abort: outstanding uncommitted changes
> ############ output ##############
>
> I'm not sure if this is because I did hg commit locally *before*
> pushing the code, but it worked last time.
> May I have your advice please? Thanks very much in advance.
>
> Thanks and Best Regards,
> Felix.

Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Zhang Xiaofei-6
Hi Mikhail,

Thanks for your hint. I checked
/usr/lib/python2.5/site-packages/hgext/win32ext.py of my cygwin 1.5 and
found no forbidcrlf() function defined. Using a cygwin 1.7 helped me to
commit. And then I found the files left behind by TortoiseHg simply had
their mode changed this time..

Till now the only files marked as uncommitted are external or generated:
############ output ##############
$ hg status
? external/dbghelp/DbgHelp.Dll
? external/gdiplus/gdiplus.dll
? external/msi/instmsia.exe
? external/msi/instmsiw.exe
? external/msvcp71/msvcr71.dll
? external/msvcp80/msvcp80.dll
? external/msvcp80/msvcr80.dll
? external/msvcp90/Microsoft.VC90.CRT.manifest
? external/msvcp90/msvcm90.dll
? external/msvcp90/msvcp90.dll
? external/msvcp90/msvcr90.dll
? external/unicows/unicows.dll
? guw/guw.exe
? moz/zipped/WNTMSCIinc.zip
? moz/zipped/WNTMSCIlib.zip
? moz/zipped/WNTMSCIruntime.zip
? winenv.set
? winenv.set.sh
############ output ##############

Should I add these files to .hgignore to let the merge go ahead? However,
will that affect the repositories of other developers?

Best Regards,
Felix.


On Fri, Jul 30, 2010 at 7:51 PM, Mikhail Voytenko <
[hidden email]> wrote:

>  Hi Felix,
>
> The message
>
>  > abort: pretxncommit.crlf hook is invalid ("hgext.win32text.forbidcrlf"
> is not defined)
> let me think that the hoot you are trying to use is probably just not
> installed. Could you please check your hg-installation to be sure that the
> hook is correctly installed.
>
> Best regards,
> Mikhail.
>
>
> On 07/30/10 12:10, Zhang Xiaofei wrote:
>
> Hi MIkhail,
>
> You are right, after last time I pushed to hg I rolled back to clean
> DEV300_m83 to restart the replacing to avoid messing up. So I guess a merge
> is necessary. But I'm getting new problems now:
>
>  I did "hg status" and the output is below:
>  ############ output ##############
>  $ hg status
> M svl/source/items/rngitem_inc.cxx
> M tools/inc/tools/globname.hxx
> M tools/inc/tools/inetmime.hxx
> M tools/inc/tools/string.hxx
> M tools/source/fsys/comdep.hxx
> M tools/source/fsys/dirent.cxx
> M tools/source/fsys/filecopy.cxx
> M tools/source/fsys/fstat.cxx
> M tools/source/fsys/tdir.cxx
> M tools/source/fsys/wldcrd.cxx
> M tools/source/fsys/wntmsc.cxx
> M tools/source/fsys/wntmsc.hxx
> M tools/source/memtools/contnr.cxx
> M tools/source/memtools/mempool.cxx
> M tools/source/memtools/multisel.cxx
> M tools/source/memtools/table.cxx
> M tools/source/memtools/unqidx.cxx
> M tools/source/stream/stream.cxx
> M unotools/inc/unotools/lingucfg.hxx
> M unotools/inc/unotools/syslocaleoptions.hxx
> M unotools/source/config/lingucfg.cxx
> M unotools/source/config/syslocaleoptions.cxx
> ? external/dbghelp/DbgHelp.Dll
> ? external/gdiplus/gdiplus.dll
> ? external/msi/instmsia.exe
> ? external/msi/instmsiw.exe
> ? external/msvcp71/msvcr71.dll
> ? external/msvcp80/msvcp80.dll
> ? external/msvcp80/msvcr80.dll
> ? external/msvcp90/Microsoft.VC90.CRT.manifest
> ? external/msvcp90/msvcm90.dll
> ? external/msvcp90/msvcp90.dll
> ? external/msvcp90/msvcr90.dll
> ? external/unicows/unicows.dll
> ? guw/guw.exe
> ? k.sh
> ? moz/zipped/WNTMSCIinc.zip
> ? moz/zipped/WNTMSCIlib.zip
> ? moz/zipped/WNTMSCIruntime.zip
> ? tools/source/stream/stream.cxx.orig
> ? winenv.set
> ? winenv.set.sh
>  ############ output ##############
>
>  This is weird as I have already committed those "M" marked files along
> with hundreds of other files using TortoiseHg, and the clone appears
> completely committed in TortoiseHg now (reading the content of files proves
> that too).
> As a consequence, when I did "hg merge" I got this:
> ############ output ##############
>  $ hg merge
> abort: outstanding uncommitted changes
>  ############ output ##############
>
>   And when I tried to commit those files by commands, I got another
> problem:
>  ############ output ##############
>  $ hg commit -m"removetooltypes01: #i112600#: TortoiseHg failed to commit
> these
> files" svl/source/items/rngitem_inc.cxx tools/inc/tools/globname.hxx
> tools/inc/
> tools/inetmime.hxx tools/inc/tools/string.hxx tools/source/fsys/comdep.hxx
> tool
> s/source/fsys/dirent.cxx tools/source/fsys/filecopy.cxx
> tools/source/fsys/fstat
> .cxx tools/source/fsys/tdir.cxx tools/source/fsys/wldcrd.cxx
> tools/source/fsys/
> wntmsc.cxx tools/source/fsys/wntmsc.hxx tools/source/memtools/contnr.cxx
> tools/
> source/memtools/mempool.cxx tools/source/memtools/multisel.cxx
> tools/source/mem
> tools/table.cxx tools/source/memtools/unqidx.cxx
> tools/source/stream/stream.cxx
>  unotools/inc/unotools/lingucfg.hxx
> unotools/inc/unotools/syslocaleoptions.hxx
> unotools/source/config/lingucfg.cxx
> unotools/source/config/syslocaleoptions.cxx
> abort: pretxncommit.crlf hook is invalid ("hgext.win32text.forbidcrlf" is
> not de
> fined)
> transaction abort!
> rollback completed
>  ############ output ##############
>
>   I suppose it has something to do with my .hgrc file, which looks like
> this:
>  ############ .hgrc ##############
>  [ui]
> # The user name will appear as author tag on commits.
> username=Zhang Xiaofei <[hidden email]>
> # Domain developers only: OOo ssh authentication for pushing
> # to 'outgoing' repositories.
> ssh=ssh -C -v -i /home/zxf/.ssh/id_dsa
>
>  [extensions]
> # Required if 'cws fetch' is used to fetch a CWS.
> hgext.mq=
> # Enables the bundled win32text extension. See [hooks] section.
> hgext.win32text=
>
>  [hooks]
> # Reject commits which would introduce windows-style CR/LF.
> # Enabling this hook is strongly suggested for OOo development.
> pretxncommit.crlf = python:hgext.win32text.forbidcrlf
>  ############ .hgrc ##############
>
>  Could you have a look and see if I missed something please?
>
>  Thanks and Best Regards,
> Felix.
>
>
> On Thu, Jul 29, 2010 at 6:37 PM, Mikhail Voytenko <
> [hidden email]> wrote:
>
>>  Hi Felix,
>>
>> I would suggest to do "hg status" to see which files were changed, and
>> commit them explicitly if the changes are OK. After that please try "hg
>> merge".
>>
>> By the way, the situation looks to be quite strange, since you are the
>> only one who works on this cws. So there should be nothing to "pull", if you
>> work from the same hg-repository always. And there should be no additional
>> heads.
>> Could you please do "hg heads" and send the output.
>>
>> Best regards,
>> Mikhail.
>>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Mikhail Voytenko-2
Hi Felix,

actually there is no need to change .hgignore to be able to merge and push.
I would say that it is a bug that the built libraries and executable
appear outside of build-tree. Changing of .hgignore would not be a
solution, it would just hide the bug.

Best regards,
Mikhail.

On 08/03/10 10:30, Zhang Xiaofei wrote:

> Hi Mikhail,
>
> Thanks for your hint. I checked
> /usr/lib/python2.5/site-packages/hgext/win32ext.py of my cygwin 1.5
> and found no forbidcrlf() function defined. Using a cygwin 1.7 helped
> me to commit. And then I found the files left behind by TortoiseHg
> simply had their mode changed this time..
>
> Till now the only files marked as uncommitted are external or generated:
> ############ output ##############
> $ hg status
> ? external/dbghelp/DbgHelp.Dll
> ? external/gdiplus/gdiplus.dll
> ? external/msi/instmsia.exe
> ? external/msi/instmsiw.exe
> ? external/msvcp71/msvcr71.dll
> ? external/msvcp80/msvcp80.dll
> ? external/msvcp80/msvcr80.dll
> ? external/msvcp90/Microsoft.VC90.CRT.manifest
> ? external/msvcp90/msvcm90.dll
> ? external/msvcp90/msvcp90.dll
> ? external/msvcp90/msvcr90.dll
> ? external/unicows/unicows.dll
> ? guw/guw.exe
> ? moz/zipped/WNTMSCIinc.zip
> ? moz/zipped/WNTMSCIlib.zip
> ? moz/zipped/WNTMSCIruntime.zip
> ? winenv.set
> ? winenv.set.sh <http://winenv.set.sh>
> ############ output ##############
>
> Should I add these files to .hgignore to let the merge go ahead?
> However, will that affect the repositories of other developers?
>
> Best Regards,
> Felix.
>
>
> On Fri, Jul 30, 2010 at 7:51 PM, Mikhail Voytenko
> <[hidden email] <mailto:[hidden email]>> wrote:
>
>     Hi Felix,
>
>     The message
>
>     > abort: pretxncommit.crlf hook is invalid
>     ("hgext.win32text.forbidcrlf" is not defined)
>     let me think that the hoot you are trying to use is probably just
>     not installed. Could you please check your hg-installation to be
>     sure that the hook is correctly installed.
>
>     Best regards,
>     Mikhail.
>
>
>     On 07/30/10 12:10, Zhang Xiaofei wrote:
>>     Hi MIkhail,
>>
>>     You are right, after last time I pushed to hg I rolled back to
>>     clean DEV300_m83 to restart the replacing to avoid messing up. So
>>     I guess a merge is necessary. But I'm getting new problems now:
>>
>>      I did "hg status" and the output is below:
>>     ############ output ##############
>>     $ hg status
>>     M svl/source/items/rngitem_inc.cxx
>>     M tools/inc/tools/globname.hxx
>>     M tools/inc/tools/inetmime.hxx
>>     M tools/inc/tools/string.hxx
>>     M tools/source/fsys/comdep.hxx
>>     M tools/source/fsys/dirent.cxx
>>     M tools/source/fsys/filecopy.cxx
>>     M tools/source/fsys/fstat.cxx
>>     M tools/source/fsys/tdir.cxx
>>     M tools/source/fsys/wldcrd.cxx
>>     M tools/source/fsys/wntmsc.cxx
>>     M tools/source/fsys/wntmsc.hxx
>>     M tools/source/memtools/contnr.cxx
>>     M tools/source/memtools/mempool.cxx
>>     M tools/source/memtools/multisel.cxx
>>     M tools/source/memtools/table.cxx
>>     M tools/source/memtools/unqidx.cxx
>>     M tools/source/stream/stream.cxx
>>     M unotools/inc/unotools/lingucfg.hxx
>>     M unotools/inc/unotools/syslocaleoptions.hxx
>>     M unotools/source/config/lingucfg.cxx
>>     M unotools/source/config/syslocaleoptions.cxx
>>     ? external/dbghelp/DbgHelp.Dll
>>     ? external/gdiplus/gdiplus.dll
>>     ? external/msi/instmsia.exe
>>     ? external/msi/instmsiw.exe
>>     ? external/msvcp71/msvcr71.dll
>>     ? external/msvcp80/msvcp80.dll
>>     ? external/msvcp80/msvcr80.dll
>>     ? external/msvcp90/Microsoft.VC90.CRT.manifest
>>     ? external/msvcp90/msvcm90.dll
>>     ? external/msvcp90/msvcp90.dll
>>     ? external/msvcp90/msvcr90.dll
>>     ? external/unicows/unicows.dll
>>     ? guw/guw.exe
>>     ? k.sh
>>     ? moz/zipped/WNTMSCIinc.zip
>>     ? moz/zipped/WNTMSCIlib.zip
>>     ? moz/zipped/WNTMSCIruntime.zip
>>     ? tools/source/stream/stream.cxx.orig
>>     ? winenv.set
>>     ? winenv.set.sh <http://winenv.set.sh>
>>     ############ output ##############
>>
>>     This is weird as I have already committed those "M" marked files
>>     along with hundreds of other files using TortoiseHg, and the
>>     clone appears completely committed in TortoiseHg now (reading the
>>     content of files proves that too).
>>     As a consequence, when I did "hg merge" I got this:
>>     ############ output ##############
>>     $ hg merge
>>     abort: outstanding uncommitted changes
>>     ############ output ##############
>>
>>     And when I tried to commit those files by commands, I got another
>>     problem:
>>     ############ output ##############
>>     $ hg commit -m"removetooltypes01: #i112600#: TortoiseHg failed to
>>     commit these
>>     files" svl/source/items/rngitem_inc.cxx
>>     tools/inc/tools/globname.hxx tools/inc/
>>     tools/inetmime.hxx tools/inc/tools/string.hxx
>>     tools/source/fsys/comdep.hxx tool
>>     s/source/fsys/dirent.cxx tools/source/fsys/filecopy.cxx
>>     tools/source/fsys/fstat
>>     .cxx tools/source/fsys/tdir.cxx tools/source/fsys/wldcrd.cxx
>>     tools/source/fsys/
>>     wntmsc.cxx tools/source/fsys/wntmsc.hxx
>>     tools/source/memtools/contnr.cxx tools/
>>     source/memtools/mempool.cxx tools/source/memtools/multisel.cxx
>>     tools/source/mem
>>     tools/table.cxx tools/source/memtools/unqidx.cxx
>>     tools/source/stream/stream.cxx
>>      unotools/inc/unotools/lingucfg.hxx
>>     unotools/inc/unotools/syslocaleoptions.hxx
>>     unotools/source/config/lingucfg.cxx
>>     unotools/source/config/syslocaleoptions.cxx
>>     abort: pretxncommit.crlf hook is invalid
>>     ("hgext.win32text.forbidcrlf" is not de
>>     fined)
>>     transaction abort!
>>     rollback completed
>>     ############ output ##############
>>
>>     I suppose it has something to do with my .hgrc file, which looks
>>     like this:
>>     ############ .hgrc ##############
>>     [ui]
>>     # The user name will appear as author tag on commits.
>>     username=Zhang Xiaofei <[hidden email]
>>     <mailto:[hidden email]>>
>>     # Domain developers only: OOo ssh authentication for pushing
>>     # to 'outgoing' repositories.
>>     ssh=ssh -C -v -i /home/zxf/.ssh/id_dsa
>>
>>     [extensions]
>>     # Required if 'cws fetch' is used to fetch a CWS.
>>     hgext.mq <http://hgext.mq>=
>>     # Enables the bundled win32text extension. See [hooks] section.
>>     hgext.win32text=
>>
>>     [hooks]
>>     # Reject commits which would introduce windows-style CR/LF.
>>     # Enabling this hook is strongly suggested for OOo development.
>>     pretxncommit.crlf = python:hgext.win32text.forbidcrlf
>>     ############ .hgrc ##############
>>
>>     Could you have a look and see if I missed something please?
>>
>>     Thanks and Best Regards,
>>     Felix.
>>
>>
>>     On Thu, Jul 29, 2010 at 6:37 PM, Mikhail Voytenko
>>     <[hidden email]
>>     <mailto:[hidden email]>> wrote:
>>
>>         Hi Felix,
>>
>>         I would suggest to do "hg status" to see which files were
>>         changed, and commit them explicitly if the changes are OK.
>>         After that please try "hg merge".
>>
>>         By the way, the situation looks to be quite strange, since
>>         you are the only one who works on this cws. So there should
>>         be nothing to "pull", if you work from the same hg-repository
>>         always. And there should be no additional heads.
>>         Could you please do "hg heads" and send the output.
>>
>>         Best regards,
>>         Mikhail.
>>
>
>

Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Mikhail Voytenko-2
Hi Felix,

to solve the merging problem we have discussed today on IRC meeting
please try to do the merge with the following arguments:
hg --config ui.merge=internal:local merge

That should let take the version from the local copy in case of conflicts.

Hope that helps.

Best regards,
Mikhail.

On 08/04/10 08:51, Mikhail Voytenko wrote:

> Hi Felix,
>
> actually there is no need to change .hgignore to be able to merge and
> push.
> I would say that it is a bug that the built libraries and executable
> appear outside of build-tree. Changing of .hgignore would not be a
> solution, it would just hide the bug.
>
> Best regards,
> Mikhail.
>
> On 08/03/10 10:30, Zhang Xiaofei wrote:
>> Hi Mikhail,
>>
>> Thanks for your hint. I checked
>> /usr/lib/python2.5/site-packages/hgext/win32ext.py of my cygwin 1.5
>> and found no forbidcrlf() function defined. Using a cygwin 1.7 helped
>> me to commit. And then I found the files left behind by TortoiseHg
>> simply had their mode changed this time..
>>
>> Till now the only files marked as uncommitted are external or generated:
>> ############ output ##############
>> $ hg status
>> ? external/dbghelp/DbgHelp.Dll
>> ? external/gdiplus/gdiplus.dll
>> ? external/msi/instmsia.exe
>> ? external/msi/instmsiw.exe
>> ? external/msvcp71/msvcr71.dll
>> ? external/msvcp80/msvcp80.dll
>> ? external/msvcp80/msvcr80.dll
>> ? external/msvcp90/Microsoft.VC90.CRT.manifest
>> ? external/msvcp90/msvcm90.dll
>> ? external/msvcp90/msvcp90.dll
>> ? external/msvcp90/msvcr90.dll
>> ? external/unicows/unicows.dll
>> ? guw/guw.exe
>> ? moz/zipped/WNTMSCIinc.zip
>> ? moz/zipped/WNTMSCIlib.zip
>> ? moz/zipped/WNTMSCIruntime.zip
>> ? winenv.set
>> ? winenv.set.sh <http://winenv.set.sh>
>> ############ output ##############
>>
>> Should I add these files to .hgignore to let the merge go ahead?
>> However, will that affect the repositories of other developers?
>>
>> Best Regards,
>> Felix.
>>
>>
>> On Fri, Jul 30, 2010 at 7:51 PM, Mikhail Voytenko
>> <[hidden email] <mailto:[hidden email]>>
>> wrote:
>>
>>     Hi Felix,
>>
>>     The message
>>
>>     > abort: pretxncommit.crlf hook is invalid
>>     ("hgext.win32text.forbidcrlf" is not defined)
>>     let me think that the hoot you are trying to use is probably just
>>     not installed. Could you please check your hg-installation to be
>>     sure that the hook is correctly installed.
>>
>>     Best regards,
>>     Mikhail.
>>
>>
>>     On 07/30/10 12:10, Zhang Xiaofei wrote:
>>>     Hi MIkhail,
>>>
>>>     You are right, after last time I pushed to hg I rolled back to
>>>     clean DEV300_m83 to restart the replacing to avoid messing up. So
>>>     I guess a merge is necessary. But I'm getting new problems now:
>>>
>>>      I did "hg status" and the output is below:
>>>     ############ output ##############
>>>     $ hg status
>>>     M svl/source/items/rngitem_inc.cxx
>>>     M tools/inc/tools/globname.hxx
>>>     M tools/inc/tools/inetmime.hxx
>>>     M tools/inc/tools/string.hxx
>>>     M tools/source/fsys/comdep.hxx
>>>     M tools/source/fsys/dirent.cxx
>>>     M tools/source/fsys/filecopy.cxx
>>>     M tools/source/fsys/fstat.cxx
>>>     M tools/source/fsys/tdir.cxx
>>>     M tools/source/fsys/wldcrd.cxx
>>>     M tools/source/fsys/wntmsc.cxx
>>>     M tools/source/fsys/wntmsc.hxx
>>>     M tools/source/memtools/contnr.cxx
>>>     M tools/source/memtools/mempool.cxx
>>>     M tools/source/memtools/multisel.cxx
>>>     M tools/source/memtools/table.cxx
>>>     M tools/source/memtools/unqidx.cxx
>>>     M tools/source/stream/stream.cxx
>>>     M unotools/inc/unotools/lingucfg.hxx
>>>     M unotools/inc/unotools/syslocaleoptions.hxx
>>>     M unotools/source/config/lingucfg.cxx
>>>     M unotools/source/config/syslocaleoptions.cxx
>>>     ? external/dbghelp/DbgHelp.Dll
>>>     ? external/gdiplus/gdiplus.dll
>>>     ? external/msi/instmsia.exe
>>>     ? external/msi/instmsiw.exe
>>>     ? external/msvcp71/msvcr71.dll
>>>     ? external/msvcp80/msvcp80.dll
>>>     ? external/msvcp80/msvcr80.dll
>>>     ? external/msvcp90/Microsoft.VC90.CRT.manifest
>>>     ? external/msvcp90/msvcm90.dll
>>>     ? external/msvcp90/msvcp90.dll
>>>     ? external/msvcp90/msvcr90.dll
>>>     ? external/unicows/unicows.dll
>>>     ? guw/guw.exe
>>>     ? k.sh
>>>     ? moz/zipped/WNTMSCIinc.zip
>>>     ? moz/zipped/WNTMSCIlib.zip
>>>     ? moz/zipped/WNTMSCIruntime.zip
>>>     ? tools/source/stream/stream.cxx.orig
>>>     ? winenv.set
>>>     ? winenv.set.sh <http://winenv.set.sh>
>>>     ############ output ##############
>>>
>>>     This is weird as I have already committed those "M" marked files
>>>     along with hundreds of other files using TortoiseHg, and the
>>>     clone appears completely committed in TortoiseHg now (reading the
>>>     content of files proves that too).     As a consequence, when I
>>> did "hg merge" I got this:
>>>     ############ output ##############
>>>     $ hg merge
>>>     abort: outstanding uncommitted changes
>>>     ############ output ##############
>>>
>>>     And when I tried to commit those files by commands, I got another
>>>     problem:
>>>     ############ output ##############
>>>     $ hg commit -m"removetooltypes01: #i112600#: TortoiseHg failed to
>>>     commit these
>>>     files" svl/source/items/rngitem_inc.cxx
>>>     tools/inc/tools/globname.hxx tools/inc/
>>>     tools/inetmime.hxx tools/inc/tools/string.hxx
>>>     tools/source/fsys/comdep.hxx tool
>>>     s/source/fsys/dirent.cxx tools/source/fsys/filecopy.cxx
>>>     tools/source/fsys/fstat
>>>     .cxx tools/source/fsys/tdir.cxx tools/source/fsys/wldcrd.cxx
>>>     tools/source/fsys/
>>>     wntmsc.cxx tools/source/fsys/wntmsc.hxx
>>>     tools/source/memtools/contnr.cxx tools/
>>>     source/memtools/mempool.cxx tools/source/memtools/multisel.cxx
>>>     tools/source/mem
>>>     tools/table.cxx tools/source/memtools/unqidx.cxx
>>>     tools/source/stream/stream.cxx
>>>      unotools/inc/unotools/lingucfg.hxx
>>>     unotools/inc/unotools/syslocaleoptions.hxx
>>>     unotools/source/config/lingucfg.cxx
>>>     unotools/source/config/syslocaleoptions.cxx
>>>     abort: pretxncommit.crlf hook is invalid
>>>     ("hgext.win32text.forbidcrlf" is not de
>>>     fined)
>>>     transaction abort!
>>>     rollback completed
>>>     ############ output ##############
>>>
>>>     I suppose it has something to do with my .hgrc file, which looks
>>>     like this:
>>>     ############ .hgrc ##############
>>>     [ui]
>>>     # The user name will appear as author tag on commits.
>>>     username=Zhang Xiaofei <[hidden email]
>>>     <mailto:[hidden email]>>
>>>     # Domain developers only: OOo ssh authentication for pushing
>>>     # to 'outgoing' repositories.
>>>     ssh=ssh -C -v -i /home/zxf/.ssh/id_dsa
>>>
>>>     [extensions]
>>>     # Required if 'cws fetch' is used to fetch a CWS.
>>>     hgext.mq <http://hgext.mq>=
>>>     # Enables the bundled win32text extension. See [hooks] section.
>>>     hgext.win32text=
>>>
>>>     [hooks]
>>>     # Reject commits which would introduce windows-style CR/LF.
>>>     # Enabling this hook is strongly suggested for OOo development.
>>>     pretxncommit.crlf = python:hgext.win32text.forbidcrlf
>>>     ############ .hgrc ##############
>>>
>>>     Could you have a look and see if I missed something please?
>>>
>>>     Thanks and Best Regards,
>>>     Felix.
>>>
>>>
>>>     On Thu, Jul 29, 2010 at 6:37 PM, Mikhail Voytenko
>>>     <[hidden email]
>>>     <mailto:[hidden email]>> wrote:
>>>
>>>         Hi Felix,
>>>
>>>         I would suggest to do "hg status" to see which files were
>>>         changed, and commit them explicitly if the changes are OK.
>>>         After that please try "hg merge".
>>>
>>>         By the way, the situation looks to be quite strange, since
>>>         you are the only one who works on this cws. So there should
>>>         be nothing to "pull", if you work from the same hg-repository
>>>         always. And there should be no additional heads.
>>>         Could you please do "hg heads" and send the output.
>>>
>>>         Best regards,
>>>         Mikhail.
>>>
>>
>>
>
>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Zhang Xiaofei-6
Hi Mikhail,

I checked the changes in rsc and found a couple of places that are special:

1. rsc/source/rscpp/*
TRUE and FALSE are redefined in rsc/source/rscpp/cppdef.h and used in the
source files.
( I also found the control char "FF" appears in the files, don't know what
it is used for )


2. rsc/source/tools/rscdef.cxx
A operator RscId::INT32() is defined in it.

What is your advice on handling them please?

Best Regards,
Felix.


On Wed, Aug 4, 2010 at 6:46 PM, Mikhail Voytenko <
[hidden email]> wrote:

> Hi Felix,
>
> to solve the merging problem we have discussed today on IRC meeting please
> try to do the merge with the following arguments:
> hg --config ui.merge=internal:local merge
>
> That should let take the version from the local copy in case of conflicts.
>
> Hope that helps.
>
> Best regards,
> Mikhail.
>
>
> On 08/04/10 08:51, Mikhail Voytenko wrote:
>
>> Hi Felix,
>>
>> actually there is no need to change .hgignore to be able to merge and
>> push.
>> I would say that it is a bug that the built libraries and executable
>> appear outside of build-tree. Changing of .hgignore would not be a solution,
>> it would just hide the bug.
>>
>> Best regards,
>> Mikhail.
>>
>> On 08/03/10 10:30, Zhang Xiaofei wrote:
>>
>>> Hi Mikhail,
>>>
>>> Thanks for your hint. I checked
>>> /usr/lib/python2.5/site-packages/hgext/win32ext.py of my cygwin 1.5 and
>>> found no forbidcrlf() function defined. Using a cygwin 1.7 helped me to
>>> commit. And then I found the files left behind by TortoiseHg simply had
>>> their mode changed this time..
>>>
>>> Till now the only files marked as uncommitted are external or generated:
>>> ############ output ##############
>>> $ hg status
>>> ? external/dbghelp/DbgHelp.Dll
>>> ? external/gdiplus/gdiplus.dll
>>> ? external/msi/instmsia.exe
>>> ? external/msi/instmsiw.exe
>>> ? external/msvcp71/msvcr71.dll
>>> ? external/msvcp80/msvcp80.dll
>>> ? external/msvcp80/msvcr80.dll
>>> ? external/msvcp90/Microsoft.VC90.CRT.manifest
>>> ? external/msvcp90/msvcm90.dll
>>> ? external/msvcp90/msvcp90.dll
>>> ? external/msvcp90/msvcr90.dll
>>> ? external/unicows/unicows.dll
>>> ? guw/guw.exe
>>> ? moz/zipped/WNTMSCIinc.zip
>>> ? moz/zipped/WNTMSCIlib.zip
>>> ? moz/zipped/WNTMSCIruntime.zip
>>> ? winenv.set
>>> ? winenv.set.sh <http://winenv.set.sh>
>>>
>>> ############ output ##############
>>>
>>> Should I add these files to .hgignore to let the merge go ahead? However,
>>> will that affect the repositories of other developers?
>>>
>>> Best Regards,
>>> Felix.
>>>
>>>
>>> On Fri, Jul 30, 2010 at 7:51 PM, Mikhail Voytenko <
>>> [hidden email] <mailto:[hidden email]>> wrote:
>>>
>>>    Hi Felix,
>>>
>>>    The message
>>>
>>>    > abort: pretxncommit.crlf hook is invalid
>>>    ("hgext.win32text.forbidcrlf" is not defined)
>>>    let me think that the hoot you are trying to use is probably just
>>>    not installed. Could you please check your hg-installation to be
>>>    sure that the hook is correctly installed.
>>>
>>>    Best regards,
>>>    Mikhail.
>>>
>>>
>>>    On 07/30/10 12:10, Zhang Xiaofei wrote:
>>>
>>>>    Hi MIkhail,
>>>>
>>>>    You are right, after last time I pushed to hg I rolled back to
>>>>    clean DEV300_m83 to restart the replacing to avoid messing up. So
>>>>    I guess a merge is necessary. But I'm getting new problems now:
>>>>
>>>>     I did "hg status" and the output is below:
>>>>    ############ output ##############
>>>>    $ hg status
>>>>    M svl/source/items/rngitem_inc.cxx
>>>>    M tools/inc/tools/globname.hxx
>>>>    M tools/inc/tools/inetmime.hxx
>>>>    M tools/inc/tools/string.hxx
>>>>    M tools/source/fsys/comdep.hxx
>>>>    M tools/source/fsys/dirent.cxx
>>>>    M tools/source/fsys/filecopy.cxx
>>>>    M tools/source/fsys/fstat.cxx
>>>>    M tools/source/fsys/tdir.cxx
>>>>    M tools/source/fsys/wldcrd.cxx
>>>>    M tools/source/fsys/wntmsc.cxx
>>>>    M tools/source/fsys/wntmsc.hxx
>>>>    M tools/source/memtools/contnr.cxx
>>>>    M tools/source/memtools/mempool.cxx
>>>>    M tools/source/memtools/multisel.cxx
>>>>    M tools/source/memtools/table.cxx
>>>>    M tools/source/memtools/unqidx.cxx
>>>>    M tools/source/stream/stream.cxx
>>>>    M unotools/inc/unotools/lingucfg.hxx
>>>>    M unotools/inc/unotools/syslocaleoptions.hxx
>>>>    M unotools/source/config/lingucfg.cxx
>>>>    M unotools/source/config/syslocaleoptions.cxx
>>>>    ? external/dbghelp/DbgHelp.Dll
>>>>    ? external/gdiplus/gdiplus.dll
>>>>    ? external/msi/instmsia.exe
>>>>    ? external/msi/instmsiw.exe
>>>>    ? external/msvcp71/msvcr71.dll
>>>>    ? external/msvcp80/msvcp80.dll
>>>>    ? external/msvcp80/msvcr80.dll
>>>>    ? external/msvcp90/Microsoft.VC90.CRT.manifest
>>>>    ? external/msvcp90/msvcm90.dll
>>>>    ? external/msvcp90/msvcp90.dll
>>>>    ? external/msvcp90/msvcr90.dll
>>>>    ? external/unicows/unicows.dll
>>>>    ? guw/guw.exe
>>>>    ? k.sh
>>>>    ? moz/zipped/WNTMSCIinc.zip
>>>>    ? moz/zipped/WNTMSCIlib.zip
>>>>    ? moz/zipped/WNTMSCIruntime.zip
>>>>    ? tools/source/stream/stream.cxx.orig
>>>>    ? winenv.set
>>>>    ? winenv.set.sh <http://winenv.set.sh>
>>>>
>>>>    ############ output ##############
>>>>
>>>>    This is weird as I have already committed those "M" marked files
>>>>    along with hundreds of other files using TortoiseHg, and the
>>>>    clone appears completely committed in TortoiseHg now (reading the
>>>>    content of files proves that too).     As a consequence, when I did
>>>> "hg merge" I got this:
>>>>    ############ output ##############
>>>>    $ hg merge
>>>>    abort: outstanding uncommitted changes
>>>>    ############ output ##############
>>>>
>>>>    And when I tried to commit those files by commands, I got another
>>>>    problem:
>>>>    ############ output ##############
>>>>    $ hg commit -m"removetooltypes01: #i112600#: TortoiseHg failed to
>>>>    commit these
>>>>    files" svl/source/items/rngitem_inc.cxx
>>>>    tools/inc/tools/globname.hxx tools/inc/
>>>>    tools/inetmime.hxx tools/inc/tools/string.hxx
>>>>    tools/source/fsys/comdep.hxx tool
>>>>    s/source/fsys/dirent.cxx tools/source/fsys/filecopy.cxx
>>>>    tools/source/fsys/fstat
>>>>    .cxx tools/source/fsys/tdir.cxx tools/source/fsys/wldcrd.cxx
>>>>    tools/source/fsys/
>>>>    wntmsc.cxx tools/source/fsys/wntmsc.hxx
>>>>    tools/source/memtools/contnr.cxx tools/
>>>>    source/memtools/mempool.cxx tools/source/memtools/multisel.cxx
>>>>    tools/source/mem
>>>>    tools/table.cxx tools/source/memtools/unqidx.cxx
>>>>    tools/source/stream/stream.cxx
>>>>     unotools/inc/unotools/lingucfg.hxx
>>>>    unotools/inc/unotools/syslocaleoptions.hxx
>>>>    unotools/source/config/lingucfg.cxx
>>>>    unotools/source/config/syslocaleoptions.cxx
>>>>    abort: pretxncommit.crlf hook is invalid
>>>>    ("hgext.win32text.forbidcrlf" is not de
>>>>    fined)
>>>>    transaction abort!
>>>>    rollback completed
>>>>    ############ output ##############
>>>>
>>>>    I suppose it has something to do with my .hgrc file, which looks
>>>>    like this:
>>>>    ############ .hgrc ##############
>>>>    [ui]
>>>>    # The user name will appear as author tag on commits.
>>>>    username=Zhang Xiaofei <[hidden email]
>>>>    <mailto:[hidden email]>>
>>>>
>>>>    # Domain developers only: OOo ssh authentication for pushing
>>>>    # to 'outgoing' repositories.
>>>>    ssh=ssh -C -v -i /home/zxf/.ssh/id_dsa
>>>>
>>>>    [extensions]
>>>>    # Required if 'cws fetch' is used to fetch a CWS.
>>>>    hgext.mq <http://hgext.mq>=
>>>>
>>>>    # Enables the bundled win32text extension. See [hooks] section.
>>>>    hgext.win32text=
>>>>
>>>>    [hooks]
>>>>    # Reject commits which would introduce windows-style CR/LF.
>>>>    # Enabling this hook is strongly suggested for OOo development.
>>>>    pretxncommit.crlf = python:hgext.win32text.forbidcrlf
>>>>    ############ .hgrc ##############
>>>>
>>>>    Could you have a look and see if I missed something please?
>>>>
>>>>    Thanks and Best Regards,
>>>>    Felix.
>>>>
>>>>
>>>>    On Thu, Jul 29, 2010 at 6:37 PM, Mikhail Voytenko
>>>>    <[hidden email]
>>>>    <mailto:[hidden email]>> wrote:
>>>>
>>>>        Hi Felix,
>>>>
>>>>        I would suggest to do "hg status" to see which files were
>>>>        changed, and commit them explicitly if the changes are OK.
>>>>        After that please try "hg merge".
>>>>
>>>>        By the way, the situation looks to be quite strange, since
>>>>        you are the only one who works on this cws. So there should
>>>>        be nothing to "pull", if you work from the same hg-repository
>>>>        always. And there should be no additional heads.
>>>>        Could you please do "hg heads" and send the output.
>>>>
>>>>        Best regards,
>>>>        Mikhail.
>>>>
>>>>
>>>
>>>
>>
>>
>
Reply | Threaded
Open this post in threaded view
|

Re: Removing deprecated types in solar.h

Mikhail Voytenko-2
Hi Felix,

the constants that are defined by a project itself should not be changed
for now. We should concentrate on the types that are used from solar.h
as the first step.

On 08/23/10 11:58, Zhang Xiaofei wrote:

> Hi Mikhail,
>
> I checked the changes in rsc and found a couple of places that are
> special:
>
> 1. rsc/source/rscpp/*
> TRUE and FALSE are redefined in rsc/source/rscpp/cppdef.h and used in
> the source files.
> ( I also found the control char "FF" appears in the files, don't know
> what it is used for )

As I have mentioned the definitions that are done internally in other
projects should not be affected at the first step. In this case the
constants look to be defined only for some C ( not C++ ) files.

>
>
> 2. rsc/source/tools/rscdef.cxx
> A operator RscId::INT32() is defined in it.

Since INT32 is going to be replaced with sal_Int32 we have to exchange
the operator name as well.

Best regards,
Mikhail.

>
> What is your advice on handling them please?
>
> Best Regards,
> Felix.
>
>
> On Wed, Aug 4, 2010 at 6:46 PM, Mikhail Voytenko
> <[hidden email] <mailto:[hidden email]>> wrote:
>
>     Hi Felix,
>
>     to solve the merging problem we have discussed today on IRC
>     meeting please try to do the merge with the following arguments:
>     hg --config ui.merge=internal:local merge
>
>     That should let take the version from the local copy in case of
>     conflicts.
>
>     Hope that helps.
>
>     Best regards,
>     Mikhail.
>
>
>     On 08/04/10 08:51, Mikhail Voytenko wrote:
>
>         Hi Felix,
>
>         actually there is no need to change .hgignore to be able to
>         merge and push.
>         I would say that it is a bug that the built libraries and
>         executable appear outside of build-tree. Changing of .hgignore
>         would not be a solution, it would just hide the bug.
>
>         Best regards,
>         Mikhail.
>
>         On 08/03/10 10:30, Zhang Xiaofei wrote:
>
>             Hi Mikhail,
>
>             Thanks for your hint. I checked
>             /usr/lib/python2.5/site-packages/hgext/win32ext.py of my
>             cygwin 1.5 and found no forbidcrlf() function defined.
>             Using a cygwin 1.7 helped me to commit. And then I found
>             the files left behind by TortoiseHg simply had their mode
>             changed this time..
>
>             Till now the only files marked as uncommitted are external
>             or generated:
>             ############ output ##############
>             $ hg status
>             ? external/dbghelp/DbgHelp.Dll
>             ? external/gdiplus/gdiplus.dll
>             ? external/msi/instmsia.exe
>             ? external/msi/instmsiw.exe
>             ? external/msvcp71/msvcr71.dll
>             ? external/msvcp80/msvcp80.dll
>             ? external/msvcp80/msvcr80.dll
>             ? external/msvcp90/Microsoft.VC90.CRT.manifest
>             ? external/msvcp90/msvcm90.dll
>             ? external/msvcp90/msvcp90.dll
>             ? external/msvcp90/msvcr90.dll
>             ? external/unicows/unicows.dll
>             ? guw/guw.exe
>             ? moz/zipped/WNTMSCIinc.zip
>             ? moz/zipped/WNTMSCIlib.zip
>             ? moz/zipped/WNTMSCIruntime.zip
>             ? winenv.set
>             ? winenv.set.sh <http://winenv.set.sh> <http://winenv.set.sh>
>
>             ############ output ##############
>
>             Should I add these files to .hgignore to let the merge go
>             ahead? However, will that affect the repositories of other
>             developers?
>
>             Best Regards,
>             Felix.
>
>
>             On Fri, Jul 30, 2010 at 7:51 PM, Mikhail Voytenko
>             <[hidden email]
>             <mailto:[hidden email]>
>             <mailto:[hidden email]
>             <mailto:[hidden email]>>> wrote:
>
>                Hi Felix,
>
>                The message
>
>                > abort: pretxncommit.crlf hook is invalid
>                ("hgext.win32text.forbidcrlf" is not defined)
>                let me think that the hoot you are trying to use is
>             probably just
>                not installed. Could you please check your
>             hg-installation to be
>                sure that the hook is correctly installed.
>
>                Best regards,
>                Mikhail.
>
>
>                On 07/30/10 12:10, Zhang Xiaofei wrote:
>
>                    Hi MIkhail,
>
>                    You are right, after last time I pushed to hg I
>                 rolled back to
>                    clean DEV300_m83 to restart the replacing to avoid
>                 messing up. So
>                    I guess a merge is necessary. But I'm getting new
>                 problems now:
>
>                     I did "hg status" and the output is below:
>                    ############ output ##############
>                    $ hg status
>                    M svl/source/items/rngitem_inc.cxx
>                    M tools/inc/tools/globname.hxx
>                    M tools/inc/tools/inetmime.hxx
>                    M tools/inc/tools/string.hxx
>                    M tools/source/fsys/comdep.hxx
>                    M tools/source/fsys/dirent.cxx
>                    M tools/source/fsys/filecopy.cxx
>                    M tools/source/fsys/fstat.cxx
>                    M tools/source/fsys/tdir.cxx
>                    M tools/source/fsys/wldcrd.cxx
>                    M tools/source/fsys/wntmsc.cxx
>                    M tools/source/fsys/wntmsc.hxx
>                    M tools/source/memtools/contnr.cxx
>                    M tools/source/memtools/mempool.cxx
>                    M tools/source/memtools/multisel.cxx
>                    M tools/source/memtools/table.cxx
>                    M tools/source/memtools/unqidx.cxx
>                    M tools/source/stream/stream.cxx
>                    M unotools/inc/unotools/lingucfg.hxx
>                    M unotools/inc/unotools/syslocaleoptions.hxx
>                    M unotools/source/config/lingucfg.cxx
>                    M unotools/source/config/syslocaleoptions.cxx
>                    ? external/dbghelp/DbgHelp.Dll
>                    ? external/gdiplus/gdiplus.dll
>                    ? external/msi/instmsia.exe
>                    ? external/msi/instmsiw.exe
>                    ? external/msvcp71/msvcr71.dll
>                    ? external/msvcp80/msvcp80.dll
>                    ? external/msvcp80/msvcr80.dll
>                    ? external/msvcp90/Microsoft.VC90.CRT.manifest
>                    ? external/msvcp90/msvcm90.dll
>                    ? external/msvcp90/msvcp90.dll
>                    ? external/msvcp90/msvcr90.dll
>                    ? external/unicows/unicows.dll
>                    ? guw/guw.exe
>                    ? k.sh
>                    ? moz/zipped/WNTMSCIinc.zip
>                    ? moz/zipped/WNTMSCIlib.zip
>                    ? moz/zipped/WNTMSCIruntime.zip
>                    ? tools/source/stream/stream.cxx.orig
>                    ? winenv.set
>                    ? winenv.set.sh <http://winenv.set.sh>
>                 <http://winenv.set.sh>
>
>                    ############ output ##############
>
>                    This is weird as I have already committed those "M"
>                 marked files
>                    along with hundreds of other files using
>                 TortoiseHg, and the
>                    clone appears completely committed in TortoiseHg
>                 now (reading the
>                    content of files proves that too).     As a
>                 consequence, when I did "hg merge" I got this:
>                    ############ output ##############
>                    $ hg merge
>                    abort: outstanding uncommitted changes
>                    ############ output ##############
>
>                    And when I tried to commit those files by commands,
>                 I got another
>                    problem:
>                    ############ output ##############
>                    $ hg commit -m"removetooltypes01: #i112600#:
>                 TortoiseHg failed to
>                    commit these
>                    files" svl/source/items/rngitem_inc.cxx
>                    tools/inc/tools/globname.hxx tools/inc/
>                    tools/inetmime.hxx tools/inc/tools/string.hxx
>                    tools/source/fsys/comdep.hxx tool
>                    s/source/fsys/dirent.cxx tools/source/fsys/filecopy.cxx
>                    tools/source/fsys/fstat
>                    .cxx tools/source/fsys/tdir.cxx
>                 tools/source/fsys/wldcrd.cxx
>                    tools/source/fsys/
>                    wntmsc.cxx tools/source/fsys/wntmsc.hxx
>                    tools/source/memtools/contnr.cxx tools/
>                    source/memtools/mempool.cxx
>                 tools/source/memtools/multisel.cxx
>                    tools/source/mem
>                    tools/table.cxx tools/source/memtools/unqidx.cxx
>                    tools/source/stream/stream.cxx
>                     unotools/inc/unotools/lingucfg.hxx
>                    unotools/inc/unotools/syslocaleoptions.hxx
>                    unotools/source/config/lingucfg.cxx
>                    unotools/source/config/syslocaleoptions.cxx
>                    abort: pretxncommit.crlf hook is invalid
>                    ("hgext.win32text.forbidcrlf" is not de
>                    fined)
>                    transaction abort!
>                    rollback completed
>                    ############ output ##############
>
>                    I suppose it has something to do with my .hgrc
>                 file, which looks
>                    like this:
>                    ############ .hgrc ##############
>                    [ui]
>                    # The user name will appear as author tag on commits.
>                    username=Zhang Xiaofei <[hidden email]
>                 <mailto:[hidden email]>
>                    <mailto:[hidden email]
>                 <mailto:[hidden email]>>>
>
>                    # Domain developers only: OOo ssh authentication
>                 for pushing
>                    # to 'outgoing' repositories.
>                    ssh=ssh -C -v -i /home/zxf/.ssh/id_dsa
>
>                    [extensions]
>                    # Required if 'cws fetch' is used to fetch a CWS.
>                    hgext.mq <http://hgext.mq> <http://hgext.mq>=
>
>                    # Enables the bundled win32text extension. See
>                 [hooks] section.
>                    hgext.win32text=
>
>                    [hooks]
>                    # Reject commits which would introduce
>                 windows-style CR/LF.
>                    # Enabling this hook is strongly suggested for OOo
>                 development.
>                    pretxncommit.crlf = python:hgext.win32text.forbidcrlf
>                    ############ .hgrc ##############
>
>                    Could you have a look and see if I missed something
>                 please?
>
>                    Thanks and Best Regards,
>                    Felix.
>
>
>                    On Thu, Jul 29, 2010 at 6:37 PM, Mikhail Voytenko
>                    <[hidden email]
>                 <mailto:[hidden email]>
>                    <mailto:[hidden email]
>                 <mailto:[hidden email]>>> wrote:
>
>                        Hi Felix,
>
>                        I would suggest to do "hg status" to see which
>                 files were
>                        changed, and commit them explicitly if the
>                 changes are OK.
>                        After that please try "hg merge".
>
>                        By the way, the situation looks to be quite
>                 strange, since
>                        you are the only one who works on this cws. So
>                 there should
>                        be nothing to "pull", if you work from the same
>                 hg-repository
>                        always. And there should be no additional heads.
>                        Could you please do "hg heads" and send the output.
>
>                        Best regards,
>                        Mikhail.
>
>
>
>
>
>
>