[Mplayer-cvslog] CVS: main mplayer.c, 1.753, 1.754 mencoder.c, 1.245, 1.246 get_path.c, 1.5, 1.6 codec-cfg.h, 1.68, 1.69

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv21582

Modified Files:
	mplayer.c mencoder.c get_path.c codec-cfg.h 
Log Message:
Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -r1.753 -r1.754
--- mplayer.c	27 Apr 2004 23:38:52 -0000	1.753
+++ mplayer.c	30 Apr 2004 16:56:00 -0000	1.754
@@ -1,5 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef WIN32
+#define _UWIN 1  /*disable Non-underscored versions of non-ANSI functions as otherwise int eof would conflict with eof()*/
+#include <windows.h>
+#endif
 #include <string.h>
 #include <unistd.h>
 
@@ -792,8 +796,6 @@
   char tmppath[MAX_PATH*2 + 1];
   char win32path[MAX_PATH];
   char realpath[MAX_PATH];
-  int       WINAPI SetEnvironmentVariableA(char*,char*);
-  int       WINAPI GetModuleFileNameA(void*,char*,int);
 #ifdef __CYGWIN__
   cygwin_conv_to_full_win32_path(WIN32_PATH,win32path);
   strcpy(tmppath,win32path);

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -r1.245 -r1.246
--- mencoder.c	30 Apr 2004 09:46:54 -0000	1.245
+++ mencoder.c	30 Apr 2004 16:56:00 -0000	1.246
@@ -23,6 +23,10 @@
 #ifdef __MINGW32__
 #define        SIGQUIT 3
 #endif
+#ifdef WIN32
+#include <windows.h>
+#endif
+
 #include <sys/time.h>
 
 #include "config.h"

Index: get_path.c
===================================================================
RCS file: /cvsroot/mplayer/main/get_path.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- get_path.c	30 Apr 2003 18:16:21 -0000	1.5
+++ get_path.c	30 Apr 2004 16:56:00 -0000	1.6
@@ -12,7 +12,6 @@
 	if ((homedir = getenv("HOME")) == NULL)
 #if defined(__MINGW32__)||defined(__CYGWIN__) /*hack to get fonts etc. loaded outside of cygwin environment*/
 	{
-    	int __stdcall GetModuleFileNameA(void* hModule,char* lpFilename,int nSize);
         int i,imax=0;       
         char exedir[260];       
         GetModuleFileNameA(NULL, exedir, 260);

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- codec-cfg.h	24 Jul 2003 19:32:59 -0000	1.68
+++ codec-cfg.h	30 Apr 2004 16:56:00 -0000	1.69
@@ -27,7 +27,7 @@
 #define CODECS_STATUS__MAX		2
 
 
-#ifndef GUID_TYPE
+#if !defined(GUID_TYPE) && !defined(GUID_DEFINED)
 #define GUID_TYPE
 typedef struct {
 	unsigned long f1;