diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-11-23 11:27:05 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-11-23 11:59:30 +0100 |
commit | 832e6d22935040fe61504c90838415fa55feb24d (patch) | |
tree | cdc9a346feecb0bb92c293902984aa6b36042707 /registry/tools/regmerge.cxx | |
parent | 6cdbf1cc9bc3fd97acdba981bad04d552dafc627 (diff) |
Some trivial fixes for MinGW with -std=c++0x enabled; not finished.
Diffstat (limited to 'registry/tools/regmerge.cxx')
-rw-r--r-- | registry/tools/regmerge.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx index 193209be2733..7b5997d782ad 100644 --- a/registry/tools/regmerge.cxx +++ b/registry/tools/regmerge.cxx @@ -95,7 +95,7 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string > & rArgs) #if (defined UNX) int main( int argc, char * argv[] ) #else -int _cdecl main( int argc, char * argv[] ) +int __cdecl main( int argc, char * argv[] ) #endif { Options_Impl options(argv[0]); |