Skip to content

Commit

Permalink
Revert "lavu: add snprintf(), vsnprint() and strtod() replacements fo…
Browse files Browse the repository at this point in the history
…r MS runtime."

This reverts commit ba53720.
A better implementation has been commited by the same author to qatar

Conflicts:

	configure

Found-by: jamal <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information
michaelni committed Sep 6, 2012
1 parent 376b16d commit 2bb6245
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 268 deletions.
64 changes: 0 additions & 64 deletions compat/snprintf.c

This file was deleted.

46 changes: 0 additions & 46 deletions compat/snprintf.h

This file was deleted.

92 changes: 0 additions & 92 deletions compat/strtod.c

This file was deleted.

37 changes: 0 additions & 37 deletions compat/strtod.h

This file was deleted.

26 changes: 0 additions & 26 deletions configure
Expand Up @@ -1054,11 +1054,6 @@ cp_if_changed(){
cp -f "$1" "$2"
}

force_include(){
flag=$(eval printf '%s%s\\n' '$FORCE_INC' $1)
append CFLAGS "$flag"
}

# CONFIG_LIST contains configurable options, while HAVE_LIST is for
# system-dependent things.

Expand Down Expand Up @@ -1268,7 +1263,6 @@ HAVE_LIST="
asm_types_h
attribute_may_alias
attribute_packed
broken_strtod
cbrtf
clock_gettime
closesocket
Expand Down Expand Up @@ -1355,7 +1349,6 @@ HAVE_LIST="
setrlimit
Sleep
sndio_h
snprintf
socklen_t
soundcard_h
strerror_r
Expand Down Expand Up @@ -2089,7 +2082,6 @@ CC_O='-o $@'
CXX_C='-c'
CXX_O='-o $@'
LD_O='-o $@'
FORCE_INC="-include"
LD_LIB='-l%'
LD_PATH='-L'
HOSTCC_C='-c'
Expand Down Expand Up @@ -3438,7 +3430,6 @@ check_func mmap
check_func ${malloc_prefix}posix_memalign && enable posix_memalign
check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
check_func setrlimit
check_func snprintf
check_func strerror_r
check_func sched_getaffinity
check_func sysconf
Expand All @@ -3458,15 +3449,6 @@ check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc
check_func_headers glob.h glob

# Check for MSVCRT; it has a broken strtod() that can't parse some input.
# Use old dos symbol to detect it. If we are on mingw, it already provides
# its own replacement and we don't need to redo that.
if check_func _get_doserrno; then
if test $target_os != mingw32; then
enable broken_strtod
fi
fi

check_header dlfcn.h
check_header dxva.h
check_header dxva2api.h -D_WIN32_WINNT=0x0600
Expand Down Expand Up @@ -3838,14 +3820,6 @@ elif enabled pathscale; then
add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
fi

# If a missing snprintf/broken strtod is detected, force-include headers
# that override prototypes and define it to a prefixed one implemented in
# libavutil. We do this at the end since -I flags aren't set in configure,
# and any additional check_cflags() beyond here will thus fail (because
# it can't find these files, because the -I$(srcdir) wasn't set).
enabled snprintf || force_include compat/snprintf.h
enabled broken_strtod && force_include compat/strtod.h

enabled_any $THREADS_LIST && enable threads

enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
Expand Down
3 changes: 0 additions & 3 deletions libavutil/Makefile
Expand Up @@ -94,9 +94,6 @@ OBJS = adler32.o \
utils.o \
xtea.o \

OBJS-$(!HAVE_SNPRINTF) += ../compat/snprintf.o
OBJS-$(HAVE_BROKEN_STRTOD) += ../compat/strtod.o

TESTPROGS = adler32 \
aes \
avstring \
Expand Down

0 comments on commit 2bb6245

Please sign in to comment.