Turn off RFC 1149 on systems that have it enabled.

[xonotic/darkplaces.git] / cl_video_libavw.c

diff --git a/cl_video_libavw.c b/cl_video_libavw.c
index 54238973258e9c4de28a1a6c00d2be4afb1d0075..dc2905fe45f2ac348e58ffad5967f02c61e2439a 100644 (file)
--- a/cl_video_libavw.c
+++ b/cl_video_libavw.c
@@ -21,12 +21,8 @@
 \r
 */\r
 \r
-#include "common.h"\r
-#ifdef _MSC_VERSION\r
-#include "stdint.h"\r
-#else\r
-#include <stdint.h>\r
-#endif\r
+// LordHavoc: for some reason this is being #include'd rather than treated as its own file...\r
+// LordHavoc: adapted to not require stdint.h as this is not available on MSVC++, using unsigned char instead of uint8_t and fs_offset_t instead of int64_t.\r
 \r
 // scaler type\r
 #define LIBAVW_SCALER_BILINEAR  0\r
@@ -49,9 +45,9 @@
 #define LIBAVW_PRINT_PANIC   4\r
 // exported callback functions:\r
 typedef void    avwCallbackPrint(int, const char *);\r
-typedef int     avwCallbackIoRead(void *, uint8_t *, int);\r
-typedef int64_t avwCallbackIoSeek(void *, int64_t, int);\r
-typedef int64_t avwCallbackIoSeekSize(void *);\r
+typedef int     avwCallbackIoRead(void *, unsigned char *, int);\r
+typedef fs_offset_t avwCallbackIoSeek(void *, fs_offset_t, int);\r
+typedef fs_offset_t avwCallbackIoSeekSize(void *);\r
 // exported functions:\r
 int         (*qLibAvW_Init)(avwCallbackPrint *printfunction); // init library, returns error code\r
 const char *(*qLibAvW_ErrorString)(int errorcode); // get string for error code\r
@@ -158,7 +154,7 @@ double libavw_getframerate(void *stream);
 double libavw_getaspectratio(void *stream);\r
 void libavw_close(void *stream);\r
 \r
-int libavw_decodeframe(void *stream, void *imagedata, unsigned int Rmask, unsigned int Gmask, unsigned int Bmask, unsigned int bytesperpixel, int imagebytesperrow)\r
+static int libavw_decodeframe(void *stream, void *imagedata, unsigned int Rmask, unsigned int Gmask, unsigned int Bmask, unsigned int bytesperpixel, int imagebytesperrow)\r
 {\r
        int pixel_format = LIBAVW_PIXEL_FORMAT_BGR;\r
        int errorcode;\r
@@ -236,21 +232,21 @@ void libavw_close(void *stream)
 }\r
 \r
 // IO wrapper\r
-int LibAvW_FS_Read(void *opaque, uint8_t *buf, int buf_size)\r
+static int LibAvW_FS_Read(void *opaque, unsigned char *buf, int buf_size)\r
 {\r
        return FS_Read((qfile_t *)opaque, buf, buf_size);\r
 }\r
-int64_t LibAvW_FS_Seek(void *opaque, int64_t pos, int whence)\r
+static fs_offset_t LibAvW_FS_Seek(void *opaque, fs_offset_t pos, int whence)\r
 {\r
-       return (int64_t)FS_Seek((qfile_t *)opaque, pos, whence);\r
+       return (fs_offset_t)FS_Seek((qfile_t *)opaque, pos, whence);\r
 }\r
-int64_t LibAvW_FS_SeekSize(void *opaque)\r
+static fs_offset_t LibAvW_FS_SeekSize(void *opaque)\r
 {\r
-       return (int64_t)FS_FileSize((qfile_t *)opaque);\r
+       return (fs_offset_t)FS_FileSize((qfile_t *)opaque);\r
 }\r
 \r
 // open as DP video stream\r
-void *LibAvW_OpenVideo(clvideo_t *video, char *filename, const char **errorstring)\r
+static void *LibAvW_OpenVideo(clvideo_t *video, char *filename, const char **errorstring)\r
 {\r
        libavwstream_t *s;\r
        char filebase[MAX_OSPATH], check[MAX_OSPATH];\r
@@ -344,7 +340,7 @@ void *LibAvW_OpenVideo(clvideo_t *video, char *filename, const char **errorstrin
        return s;\r
 }\r
 \r
-void libavw_message(int level, const char *message)\r
+static void libavw_message(int level, const char *message)\r
 {\r
        if (level == LIBAVW_PRINT_WARNING)\r
                Con_Printf("LibAvcodec warning: %s\n", message);\r
@@ -356,7 +352,7 @@ void libavw_message(int level, const char *message)
                Con_Printf("LibAvcodec panic: %s\n", message);\r
 }\r
 \r
-qboolean LibAvW_OpenLibrary(void)\r
+static qboolean LibAvW_OpenLibrary(void)\r
 {\r
        int errorcode;\r
 \r
@@ -383,7 +379,7 @@ qboolean LibAvW_OpenLibrary(void)
        return true;\r
 }\r
 \r
-void LibAvW_CloseLibrary(void)\r
+static void LibAvW_CloseLibrary(void)\r
 {\r
        Sys_UnloadLibrary(&libavw_dll);\r
 }\r