Merge ozone header

svn-id: r24266

3 files changed, 18 insertions, 43 deletions

diff --git a/backends/platform/wince/ozone.h b/backends/platform/wince/ozone.h
deleted file mode 100644
index 45de0bbb97..0000000000
--- a/backends/platform/wince/ozone.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2006 The ScummVM project
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#define GETRAWFRAMEBUFFER   0x00020001
-
-#define FORMAT_565 1
-#define FORMAT_555 2
-#define FORMAT_OTHER 3
-
-#if defined(_WIN32_WCE) && _WIN32_WCE <= 300
-typedef struct _RawFrameBufferInfo
-{
-   WORD wFormat;
-   WORD wBPP;
-   VOID *pFramePointer;
-   int  cxStride;
-   int  cyStride;
-   int  cxPixels;
-   int  cyPixels;
-} RawFrameBufferInfo;
-#endif
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 8fd43c509f..4dc7d7c410 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -45,7 +45,6 @@
 
 #include "sound/fmopl.h"
 
-#include "ozone.h"
 #include "CEException.h"
 
 #ifdef USE_VORBIS
diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h
index cd1598c9df..2975491872 100644
--- a/backends/platform/wince/wince-sdl.h
+++ b/backends/platform/wince/wince-sdl.h
@@ -37,10 +37,26 @@
 
 #include <SDL.h>
 
-
-
 #define TOTAL_ZONES 3
 
+// defines used for implementing the raw frame buffer access method (2003+)
+#define GETRAWFRAMEBUFFER   0x00020001
+#define FORMAT_565 1
+#define FORMAT_555 2
+#define FORMAT_OTHER 3
+#if defined(_WIN32_WCE) && _WIN32_WCE <= 300
+typedef struct _RawFrameBufferInfo
+{
+	WORD wFormat;
+	WORD wBPP;
+	VOID *pFramePointer;
+	int  cxStride;
+	int  cyStride;
+	int  cxPixels;
+	int  cyPixels;
+} RawFrameBufferInfo;
+#endif
+
 class OSystem_WINCE3 : public OSystem_SDL {
 public:
 	OSystem_WINCE3();