summaryrefslogtreecommitdiffstats
path: root/registry/tools/regmerge.cxx
diff options
context:
space:
mode:
authorFrancois Tigeot <ftigeot@wolfpond.org>2011-04-16 09:08:29 +0200
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-04-18 16:59:48 +0200
commit35e1b53c7e6176315257cae9434ec4364262282c (patch)
tree32c349e5d26d2e4475af8ae260bdc29ca4dd17f3 /registry/tools/regmerge.cxx
parentKill Pos_XXX in favour of osl_Pos_XXX (diff)
downloadcore-35e1b53c7e6176315257cae9434ec4364262282c.tar.gz
core-35e1b53c7e6176315257cae9434ec4364262282c.zip
Remove OS/2 support.
Diffstat (limited to 'registry/tools/regmerge.cxx')
-rw-r--r--registry/tools/regmerge.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 9e25bc56f396..193209be2733 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -92,7 +92,7 @@ bool Options_Impl::initOptions_Impl (std::vector< std::string > & rArgs)
return true;
}
-#if (defined UNX) || (defined OS2)
+#if (defined UNX)
int main( int argc, char * argv[] )
#else
int _cdecl main( int argc, char * argv[] )
@@ -179,4 +179,4 @@ int _cdecl main( int argc, char * argv[] )
return(0);
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ \ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */