diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | include/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | src/libw32dll/wine/win32.c | 3 |
4 files changed, 11 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 84e2a48a7..55eceb3b9 100644 --- a/configure.ac +++ b/configure.ac @@ -198,7 +198,7 @@ AC_TYPE_SIZE_T AC_CHECK_SIZEOF(long) dnl AC_CHECK_TYPES([ptrdiff_t]) dnl For systems without inttypes.h would be needed extend generated replacement. -AC_CHECK_GENERATE_INTTYPES([lib]) +AC_CHECK_GENERATE_INTTYPES([include]) AM_CONDITIONAL(GENERATED_INTTYPES_H, test x"$ac_cv_header_inttypes_h" != x"yes") AC_CHECK_TYPE(ssize_t, :, AC_DEFINE(ssize_t, __int64, [define ssize_t to __int64 if it's missing in default includes])) @@ -2235,7 +2235,7 @@ if test x"$SYS" = "xmingw32" -o x"$SYS" = "xcygwin"; then XINE_REL_FONTDIR="`echo "$XINE_REL_FONTDIR" | sed -e 's/\\//\\\\\\\\/g'`" XINE_REL_LOCALEDIR="`echo "$XINE_REL_LOCALEDIR" | sed -e 's/\\//\\\\\\\\/g'`" dnl prefix in xine-config - XINE_CONFIG_PREFIX="\`dirname \$0\`/.." + XINE_CONFIG_PREFIX="\$(cd \$(dirname \$0)/..; pwd)" dnl installation directories (in xine-config) XINE_PLUGINPATH="$XINE_CONFIG_PREFIX/$XINE_REL_PLUGINDIR" XINE_FONTPATH="$XINE_CONFIG_PREFIX/$XINE_REL_FONTDIR" diff --git a/include/Makefile.am b/include/Makefile.am index cda4494e0..bbf090750 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,8 +1,12 @@ EXTRA_DIST = xine.h.in -include_HEADERS = xine.h +if GENERATED_INTTYPES_H +inttypes_h = inttypes.h +endif -CONFIG_CLEAN_FILES = xine.h +include_HEADERS = xine.h $(inttypes_h) + +CONFIG_CLEAN_FILES = xine.h $(inttypes_h) debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" diff --git a/lib/Makefile.am b/lib/Makefile.am index d2295c9db..e2eec74c5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,10 +1,6 @@ include $(top_srcdir)/misc/Makefile.common -if GENERATED_INTTYPES_H -inttypes_h = inttypes.h -endif - -EXTRA_DIST = Makefile.common $(inttypes_h) +EXTRA_DIST = Makefile.common noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c index b9b4353b1..4fe1956b7 100644 --- a/src/libw32dll/wine/win32.c +++ b/src/libw32dll/wine/win32.c @@ -4556,7 +4556,8 @@ static HPALETTE WINAPI expCreatePalette(CONST LOGPALETTE *lpgpl) i = sizeof(LOGPALETTE)+((lpgpl->palNumEntries-1)*sizeof(PALETTEENTRY)); test = (HPALETTE)malloc(i); - memcpy((void *)test, lpgpl, i); + /* preventive expect bad values leading to overapping */ + memmove((void *)test, lpgpl, i); return test; } |