Simplifies host/target libc detection splitting.
Unified · Split
| @@ -1332,6 +1332,7 @@ HAVE_LIST=" · 1331 unmodified lines | ||
| 1332 | 1332 | isatty |
| 1333 | 1333 | jack_port_get_latency_range |
| 1334 | 1334 | ldbrx |
| 1335 | + libc_msvcrt | |
| 1335 | 1336 | libdc1394_1 |
| 1336 | 1337 | libdc1394_2 |
| 1337 | 1338 | local_aligned_16 |
| @@ -1349,7 +1350,6 @@ HAVE_LIST=" · 11 unmodified lines | ||
| 1349 | 1350 | mm_empty |
| 1350 | 1351 | mmap |
| 1351 | 1352 | mprotect |
| 1352 | − msvcrt | |
| 1353 | 1353 | nanosleep |
| 1354 | 1354 | poll_h |
| 1355 | 1355 | posix_memalign |
| @@ -1557,7 +1557,7 @@ need_memalign="altivec neon sse" · 201 unmodified lines | ||
| 1557 | 1557 | |
| 1558 | 1558 | symver_if_any="symver_asm_label symver_gnu_asm" |
| 1559 | 1559 | |
| 1560 | −log2_deps="!msvcrt" | |
| 1560 | +log2_deps="!libc_msvcrt" | |
| 1561 | 1561 | |
| 1562 | 1562 | # subsystems |
| 1563 | 1563 | dct_select="rdft" |
| @@ -3413,7 +3413,7 @@ elif check_cpp_condition sys/brand.h "defined SOLARIS_BRAND_NAME"; then · 1849 unmodified lines | ||
| 3413 | 3413 | add_cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 |
| 3414 | 3414 | fi |
| 3415 | 3415 | |
| 3416 | −test -n "$libc_type" && enable $libc_type | |
| 3416 | +test -n "$libc_type" && enable libc_$libc_type | |
| 3417 | 3417 | |
| 3418 | 3418 | case $libc_type in |
| 3419 | 3419 | bionic) |
| @@ -3429,7 +3429,7 @@ esac · 9 unmodified lines | ||
| 3429 | 3429 | |
| 3430 | 3430 | # hacks for compiler/libc/os combinations |
| 3431 | 3431 | |
| 3432 | −if enabled_all tms470 glibc; then | |
| 3432 | +if enabled_all tms470 libc_glibc; then | |
| 3433 | 3433 | CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}" |
| 3434 | 3434 | add_cppflags -D__USER_LABEL_PREFIX__= |
| 3435 | 3435 | add_cppflags -D__builtin_memset=memset |
| @@ -3437,7 +3437,7 @@ if enabled_all tms470 glibc; then · 1 unmodified line | ||
| 3437 | 3437 | add_cflags -pds=48 # incompatible redefinition of macro |
| 3438 | 3438 | fi |
| 3439 | 3439 | |
| 3440 | −if enabled_all ccc glibc; then | |
| 3440 | +if enabled_all ccc libc_glibc; then | |
| 3441 | 3441 | add_ldflags -Wl,-z,now # calls to libots crash without this |
| 3442 | 3442 | fi |
| 3443 | 3443 | |
| @@ -25,8 +25,6 @@ OBJS = allcodecs.o \ · 24 unmodified lines | ||
| 25 | 25 | raw.o \ |
| 26 | 26 | utils.o \ |
| 27 | 27 | |
| 28 | −OBJS-$(HAVE_MSVCRT) += file_open.o | |
| 29 | − | |
| 30 | 28 | # parts needed for many different codecs |
| 31 | 29 | OBJS-$(CONFIG_AANDCTTABLES) += aandcttab.o |
| 32 | 30 | OBJS-$(CONFIG_AC3DSP) += ac3dsp.o |
| @@ -677,6 +675,7 @@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o · 644 unmodified lines | ||
| 677 | 675 | OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o |
| 678 | 676 | |
| 679 | 677 | # thread libraries |
| 678 | +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o | |
| 680 | 679 | OBJS-$(HAVE_PTHREADS) += pthread.o pthread_slice.o pthread_frame.o |
| 681 | 680 | OBJS-$(HAVE_W32THREADS) += pthread.o pthread_slice.o pthread_frame.o |
| 682 | 681 | |
| @@ -7,8 +7,6 @@ HEADERS = avdevice.h \ · 6 unmodified lines | ||
| 7 | 7 | OBJS = alldevices.o \ |
| 8 | 8 | avdevice.o \ |
| 9 | 9 | |
| 10 | −OBJS-$(HAVE_MSVCRT) += file_open.o | |
| 11 | − | |
| 12 | 10 | # input/output devices |
| 13 | 11 | OBJS-$(CONFIG_ALSA_INDEV) += alsa-audio-common.o \ |
| 14 | 12 | alsa-audio-dec.o |
| @@ -31,6 +29,8 @@ OBJS-$(CONFIG_X11GRAB_INDEV) += x11grab.o · 16 unmodified lines | ||
| 31 | 29 | OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o |
| 32 | 30 | OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o |
| 33 | 31 | |
| 32 | +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o | |
| 33 | + | |
| 34 | 34 | SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h |
| 35 | 35 | SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h |
| 36 | 36 | |
| @@ -23,8 +23,6 @@ OBJS = allformats.o \ · 22 unmodified lines | ||
| 23 | 23 | url.o \ |
| 24 | 24 | utils.o \ |
| 25 | 25 | |
| 26 | −OBJS-$(HAVE_MSVCRT) += file_open.o | |
| 27 | − | |
| 28 | 26 | OBJS-$(CONFIG_NETWORK) += network.o |
| 29 | 27 | OBJS-$(CONFIG_RIFFDEC) += riffdec.o |
| 30 | 28 | OBJS-$(CONFIG_RIFFENC) += riffenc.o |
| @@ -388,6 +386,8 @@ OBJS-$(CONFIG_TLS_PROTOCOL) += tls.o · 357 unmodified lines | ||
| 388 | 386 | OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o |
| 389 | 387 | OBJS-$(CONFIG_UNIX_PROTOCOL) += unix.o |
| 390 | 388 | |
| 389 | +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o | |
| 390 | + | |
| 391 | 391 | SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h |
| 392 | 392 | SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h |
| 393 | 393 | |
| @@ -204,7 +204,7 @@ void avpriv_report_missing_feature(void *avc, · 203 unmodified lines | ||
| 204 | 204 | void avpriv_request_sample(void *avc, |
| 205 | 205 | const char *msg, ...) av_printf_format(2, 3); |
| 206 | 206 | |
| 207 | −#if HAVE_MSVCRT | |
| 207 | +#if HAVE_LIBC_MSVCRT | |
| 208 | 208 | #define avpriv_open ff_open |
| 209 | 209 | #endif |
| 210 | 210 | |