#65293#: MSVC places functions from <cstdio>, <cstdlib>, etc. in global namespace

3 files changed, 19 insertions, 17 deletions

diff --git a/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index 6b264f8c8706..86d9ab36500c 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bmp.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2002-02-21 14:45:08 $
+ *  last change: $Author: hr $ $Date: 2002-02-25 13:49:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,9 +59,11 @@
  *
  ************************************************************************/
 
-#include <cstdio>
-#include <csignal>
+#include <stdio.h>
+#include <signal.h>
 #include <vector>
+using namespace std;
+
 #include <vcl/svapp.hxx>
 
 #include "solar.hrc"
@@ -151,7 +153,7 @@ void BmpApp::Message( const String& rText, BYTE cExitCode )
 
     ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
     aText.Append( "\r\n" );
-    std::fprintf( stderr, aText.GetBuffer() );
+    fprintf( stderr, aText.GetBuffer() );
 }
 
 // -----------------------------------------------------------------------------
@@ -208,7 +210,7 @@ int BmpApp::Start( const ::std::vector< String >& rArgs )
     }
 
     if ( EXIT_NOERROR != cExitCode )
-        std::raise( SIGABRT );
+        raise( SIGABRT );
 
     return cExitCode;
 }
diff --git a/svtools/bmpmaker/bmpgui.cxx b/svtools/bmpmaker/bmpgui.cxx
index 6c885fd39e9a..a27dc37afdfb 100644
--- a/svtools/bmpmaker/bmpgui.cxx
+++ b/svtools/bmpmaker/bmpgui.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: bmpgui.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2002-02-21 14:45:08 $
+ *  last change: $Author: hr $ $Date: 2002-02-25 13:49:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#include <cstdio>
-#include <csignal>
+#include <stdio.h>
+#include <signal.h>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
@@ -386,7 +386,7 @@ void BmpApp::Main( )
     }
 
     if( EXIT_NOERROR != cExitCode )
-        std::raise( SIGABRT );
+        raise( SIGABRT );
 
     return;
 }
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index c921d1ae8f3e..c2dbb37efdf0 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: g2g.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: hr $ $Date: 2002-02-21 14:45:08 $
+ *  last change: $Author: hr $ $Date: 2002-02-25 13:49:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,8 +59,8 @@
  *
  ************************************************************************/
 
-#include <cstdio>
-#include <csignal>
+#include <stdio.h>
+#include <signal.h>
 #include <ctype.h>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
@@ -138,7 +138,7 @@ void G2GApp::Message( const String& rText, BYTE cExitCode )
 
     ByteString aText( rText, RTL_TEXTENCODING_UTF8 );
     aText.Append( "\r\n" );
-    std::fprintf( stderr, aText.GetBuffer() );
+    fprintf( stderr, aText.GetBuffer() );
 }
 
 // -----------------------------------------------------------------------------
@@ -244,7 +244,7 @@ void G2GApp::Main( )
         ShowUsage();
 
     if( EXIT_NOERROR != cExitCode )
-        std::raise( SIGABRT );
+        raise( SIGABRT );
 }
 
 // ---------------