diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:57:04 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:57:04 +0000 |
| commit | 89cc98cc37ef5cc58b8ed268898f080d4eb7dc7c (patch) | |
| tree | f1277a2124616354d15a58305857500837257ee3 /avmedia | |
| parent | fa71e3721206ba4259fa7eb806c429e994d23d5e (diff) | |
INTEGRATION: CWS sb91 (1.11.6); FILE MERGED
2008/07/11 09:05:55 sb 1.11.6.1: #i91042# #include <cXXX> vs. <XXX.h> and using identifiers without std:: prefix (which is necessary for old MSVC versions)
Diffstat (limited to 'avmedia')
| -rw-r--r-- | avmedia/source/framework/mediacontrol.cxx | 4 | ||||
| -rw-r--r-- | avmedia/source/viewer/mediawindow.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index b66b627b61..4675da3ac3 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mediacontrol.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -39,7 +39,7 @@ #include <vcl/lstbox.hxx> #include <svtools/syslocale.hxx> #include <sfx2/viewfrm.hxx> -#include <cmath> +#include <math.h> #include <algorithm> #define AVMEDIA_TIMEOUT 100 diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index ac6a0d630b..f6ca9f0d75 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: mediawindow.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <cstdio> +#include <stdio.h> #include <avmedia/mediawindow.hxx> #include "mediawindow_impl.hxx" |