Update of /cvsroot/mplayer/main/libvo In directory usw-pr-cvs1:/tmp/cvs-serv7869/libvo Modified Files: Makefile vo_sdl.c x11_common.c Log Message: applied solaris8/netbsd/other fixes patch by Jürgen Keil <jk@tools.de> Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libvo/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile 2001/06/04 19:33:28 1.8 --- Makefile 2001/06/05 18:40:44 1.9 *************** *** 7,11 **** OBJS=$(SRCS:.c=.o) ! CFLAGS = $(OPTFLAGS) -I. -I.. -DMPG12PLAY # -I/usr/X11R6/include/ --- 7,11 ---- OBJS=$(SRCS:.c=.o) ! CFLAGS = $(OPTFLAGS) -I. -I.. -DMPG12PLAY $(SDL_INC) # -I/usr/X11R6/include/ Index: vo_sdl.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -r1.39 -r1.40 *** vo_sdl.c 2001/06/03 21:02:46 1.39 --- vo_sdl.c 2001/06/05 18:40:44 1.40 *************** *** 137,140 **** --- 137,141 ---- }; + #ifdef __FreeBSD__ #include <SDL11/SDL.h> *************** *** 142,145 **** --- 143,164 ---- #include <SDL/SDL.h> #endif + + + #if defined(sun) && defined(__svr4__) + /* setenv is missing on solaris */ + static void setenv(const char *name, const char *val, int _xx) + { + int len = strlen(name) + strlen(val) + 2; + char *env = malloc(len); + + if (env != NULL) { + strcpy(env, name); + strcat(env, "="); + strcat(env, val); + putenv(env); + } + } + #endif + #define FS 0x01 Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** x11_common.c 2001/05/31 22:32:58 1.20 --- x11_common.c 2001/06/05 18:40:44 1.21 *************** *** 177,181 **** char buf[100]; KeySym keySym; ! XComposeStatus stat; // unsigned long vo_KeyTable[512]; --- 177,181 ---- char buf[100]; KeySym keySym; ! static XComposeStatus stat; // unsigned long vo_KeyTable[512]; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog