diff options
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/Makefile | 2 | ||||
| -rw-r--r-- | libvo/vo_sdl.c | 19 | ||||
| -rw-r--r-- | libvo/x11_common.c | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/libvo/Makefile b/libvo/Makefile index 556d918dcd..55861d43ca 100644 --- a/libvo/Makefile +++ b/libvo/Makefile @@ -6,7 +6,7 @@ LIBNAME = libvo.a SRCS=aclib.c osd.c font_load.c rgb15to16mmx.c yuv2rgb_mmx.c yuv2rgb.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_odivx.c x11_common.c $(OPTIONAL_SRCS) OBJS=$(SRCS:.c=.o) -CFLAGS = $(OPTFLAGS) -I. -I.. -DMPG12PLAY +CFLAGS = $(OPTFLAGS) -I. -I.. -DMPG12PLAY $(SDL_INC) # -I/usr/X11R6/include/ .SUFFIXES: .c .o diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 27a7a87150..8bbe90db9c 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -136,12 +136,31 @@ static vo_info_t vo_info = "" }; + #ifdef __FreeBSD__ #include <SDL11/SDL.h> #else #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 #define VM 0x02 #define ZOOM 0x04 diff --git a/libvo/x11_common.c b/libvo/x11_common.c index b33cf7874f..8e6d77d102 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -176,7 +176,7 @@ int vo_x11_check_events(Display *mydisplay){ XEvent Event; char buf[100]; KeySym keySym; - XComposeStatus stat; + static XComposeStatus stat; // unsigned long vo_KeyTable[512]; #ifdef HAVE_GUI |