--- a/gst_plugins_base/gst/videoscale/vs_image.h	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/gst/videoscale/vs_image.h	Wed Sep 01 12:16:41 2010 +0100
@@ -27,8 +27,9 @@
 
 #ifndef __VS_IMAGE_H__
 #define __VS_IMAGE_H__
+//#include <liboil/liboil-stdint.h>
 
-#include <liboil/liboil-stdint.h>
+typedef unsigned char uint8_t;
 
 typedef struct _VSImage VSImage;
 
@@ -38,109 +39,41 @@
   int height;
   int stride;
 };
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_RGBA (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_RGBA (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_RGB (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_RGB (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_YUYV (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_YUYV (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_UYVY (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_UYVY (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_Y (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_Y (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_RGB565 (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_RGB565 (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 
 void vs_image_scale_nearest_RGB555 (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-
 void vs_image_scale_linear_RGB555 (const VSImage *dest, const VSImage *src,
     uint8_t *tmpbuf);
 
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-void vs_image_scale_nearest_Y16 (const VSImage *dest, const VSImage *src,
-    uint8_t *tmpbuf);
-
-#ifdef __SYMBIAN32__
-IMPORT_C
-#endif
-void vs_image_scale_linear_Y16 (const VSImage *dest, const VSImage *src,
-    uint8_t *tmpbuf);
-
 #endif