remove the last NOT_HAVE_LOG2 instances

Change-Id: I193ecf82316cd1d5d7ddeebebf8fc98afccf0ede
This commit is contained in:
Pascal Massimino 2012-08-01 18:48:19 -07:00 committed by Gerrit Code Review
parent 323dc4d9b9
commit 9b261bf521
3 changed files with 2 additions and 7 deletions

View File

@ -50,7 +50,7 @@ LOCAL_SRC_FILES := \
src/utils/utils.c \ src/utils/utils.c \
LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD \ LOCAL_CFLAGS := -Wall -DANDROID -DHAVE_MALLOC_H -DHAVE_PTHREAD \
-DNOT_HAVE_LOG2 -DWEBP_USE_THREAD \ -DWEBP_USE_THREAD \
-finline-functions -frename-registers -ffast-math \ -finline-functions -frename-registers -ffast-math \
-s -fomit-frame-pointer -Isrc/webp -s -fomit-frame-pointer -Isrc/webp

View File

@ -27,7 +27,7 @@ CCNODBG = cl.exe /nologo /O2 /DNDEBUG
CCDEBUG = cl.exe /nologo /Od /Gm /Zi /D_DEBUG /RTC1 CCDEBUG = cl.exe /nologo /Od /Gm /Zi /D_DEBUG /RTC1
CFLAGS = /Isrc /nologo /W3 /EHsc /FD /c /GS CFLAGS = /Isrc /nologo /W3 /EHsc /FD /c /GS
CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN CFLAGS = $(CFLAGS) /DWIN32 /D_CRT_SECURE_NO_WARNINGS /DWIN32_LEAN_AND_MEAN
CFLAGS = $(CFLAGS) /DHAVE_WINCODEC_H /DWEBP_USE_THREAD /DNOT_HAVE_LOG2 CFLAGS = $(CFLAGS) /DHAVE_WINCODEC_H /DWEBP_USE_THREAD
LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE LDFLAGS = /LARGEADDRESSAWARE /MANIFEST /NXCOMPAT /DYNAMICBASE
LDFLAGS = $(LDFLAGS) $(PLATFORM_LDFLAGS) LDFLAGS = $(LDFLAGS) $(PLATFORM_LDFLAGS)
LNKDLL = link.exe /DLL LNKDLL = link.exe /DLL

View File

@ -29,11 +29,6 @@ AC_DEFUN([WITHLIB_OPTION],
[use $2 libraries from DIR]), [use $2 libraries from DIR]),
[$2_LIBS="-L$withval"])]) [$2_LIBS="-L$withval"])])
dnl === Check for native log2
AC_SEARCH_LIBS([log2], [m],,
[AC_DEFINE([NOT_HAVE_LOG2], [1],
[Undefine this if you have log2().])])
dnl === Check for pthread support dnl === Check for pthread support
AC_ARG_ENABLE([threading], AC_ARG_ENABLE([threading],
AS_HELP_STRING([--disable-threading], AS_HELP_STRING([--disable-threading],