summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-11-23 11:27:05 +0100
committerJan Holesovsky <kendy@suse.cz>2011-11-23 11:59:30 +0100
commit832e6d22935040fe61504c90838415fa55feb24d (patch)
treecdc9a346feecb0bb92c293902984aa6b36042707 /registry
parent6cdbf1cc9bc3fd97acdba981bad04d552dafc627 (diff)
Some trivial fixes for MinGW with -std=c++0x enabled; not finished.
Diffstat (limited to 'registry')
-rw-r--r--registry/tools/regmerge.cxx2
-rw-r--r--registry/tools/regview.cxx2
2 files changed, 2 insertions, 2 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]);
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 2cb11b815c86..57ebcea1270b 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -43,7 +43,7 @@ using namespace registry::tools;
#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
{
RegHandle hReg;