diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-04-06 13:33:25 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-04-06 13:33:25 +0000 |
| commit | 56c3c5438b1c350fcf85fc3c40bd2b17ee998fb5 (patch) | |
| tree | 4d22cfb9be30a524bea9c94df2a4b61e7b4e259e /lib/libXvMC/wrapper | |
| parent | 12164cf09f9c31ca8c2d928c95f35991085c5e42 (diff) | |
Update to libXvMC 1.0.9
Diffstat (limited to 'lib/libXvMC/wrapper')
| -rw-r--r-- | lib/libXvMC/wrapper/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/libXvMC/wrapper/Makefile.in | 5 | ||||
| -rw-r--r-- | lib/libXvMC/wrapper/XvMCWrapper.c | 10 |
3 files changed, 9 insertions, 8 deletions
diff --git a/lib/libXvMC/wrapper/Makefile.am b/lib/libXvMC/wrapper/Makefile.am index b3a1c2174..fbe8cf745 100644 --- a/lib/libXvMC/wrapper/Makefile.am +++ b/lib/libXvMC/wrapper/Makefile.am @@ -10,7 +10,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS) libXvMCW_la_SOURCES = XvMCWrapper.c -libXvMCW_la_LIBADD = $(XVMC_LIBS) +libXvMCW_la_LIBADD = $(XVMC_LIBS) $(DLOPEN_LIBS) libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined if LINT diff --git a/lib/libXvMC/wrapper/Makefile.in b/lib/libXvMC/wrapper/Makefile.in index aab971e7d..c20d3b569 100644 --- a/lib/libXvMC/wrapper/Makefile.in +++ b/lib/libXvMC/wrapper/Makefile.in @@ -91,7 +91,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = -libXvMCW_la_DEPENDENCIES = $(am__DEPENDENCIES_1) +libXvMCW_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_libXvMCW_la_OBJECTS = XvMCWrapper.lo libXvMCW_la_OBJECTS = $(am_libXvMCW_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -169,6 +169,7 @@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ +DLOPEN_LIBS = @DLOPEN_LIBS@ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ DSYMUTIL = @DSYMUTIL@ @@ -298,7 +299,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = $(CWARNFLAGS) $(XVMC_CFLAGS) libXvMCW_la_SOURCES = XvMCWrapper.c -libXvMCW_la_LIBADD = $(XVMC_LIBS) +libXvMCW_la_LIBADD = $(XVMC_LIBS) $(DLOPEN_LIBS) libXvMCW_la_LDFLAGS = -version-number 1:0:0 -no-undefined @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) \ @LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) diff --git a/lib/libXvMC/wrapper/XvMCWrapper.c b/lib/libXvMC/wrapper/XvMCWrapper.c index bff5a8b88..9bdf03374 100644 --- a/lib/libXvMC/wrapper/XvMCWrapper.c +++ b/lib/libXvMC/wrapper/XvMCWrapper.c @@ -178,15 +178,15 @@ static void *handle2; #define XW_RSYM(base,handle,handle2,pointer, retval) \ do { \ - register char *err; \ + register char *symerr; \ base.pointer = (pointer##P) dlsym((handle),#pointer); \ - if ((err = dlerror()) != NULL) { \ + if ((symerr = dlerror()) != NULL) { \ if (!handle2) { \ - fprintf(stderr,"%s\n",err); return retval; \ + fprintf(stderr,"%s\n",symerr); return retval; \ } \ base.pointer = (pointer##P) dlsym((handle2),#pointer); \ - if ((err = dlerror()) != NULL) { \ - fprintf(stderr,"%s\n",err); return retval; \ + if ((symerr = dlerror()) != NULL) { \ + fprintf(stderr,"%s\n",symerr); return retval; \ } \ } \ } while (0); |