diff options
| author | Stephen Fisher <sfisher@sdf.org> | 2014-12-19 23:03:14 +0000 |
|---|---|---|
| committer | Stephen Fisher <sfisher@sdf.org> | 2014-12-19 23:12:09 +0000 |
| commit | 47dc4e77ccfd1f1f4d5d187429860cf0b51a8757 (patch) | |
| tree | 2cab01e2d88e3ba6f6c26cbcc33661ba3a7d8556 | |
| parent | e2586ec36d0d924b933d2127e809918b980cb413 (diff) | |
| download | wireshark-47dc4e77ccfd1f1f4d5d187429860cf0b51a8757.tar.gz | |
Revert "Provide a floorl() function (which is currently only able to call GCC's __builtin_floorl() function) for systems which don't provide one." because I left off the new wsutil/floor.[ch] files
This reverts commit e2586ec36d0d924b933d2127e809918b980cb413.
Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91
Reviewed-on: https://code.wireshark.org/review/5891
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | ui/time_shift.c | 2 | ||||
| -rw-r--r-- | wsutil/Makefile.common | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 73572c524b..42c01ec7b3 100644 --- a/configure.ac +++ b/configure.ac @@ -2736,7 +2736,6 @@ AC_SUBST(STRPTIME_LO) AC_CHECK_FUNCS(getprotobynumber gethostbyname2) AC_CHECK_FUNCS(issetugid) AC_CHECK_FUNCS(mmap mprotect sysconf) -AC_CHECK_FUNCS(floorl) dnl blank for now, but will be used in future AC_SUBST(wireshark_SUBDIRS) diff --git a/ui/time_shift.c b/ui/time_shift.c index d9275526ec..3363c50f40 100644 --- a/ui/time_shift.c +++ b/ui/time_shift.c @@ -33,8 +33,6 @@ #include "ui/ui_util.h" -#include "wsutil/floor.h" - #define SHIFT_POS 0 #define SHIFT_NEG 1 #define SHIFT_SETTOZERO 1 diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common index d09c7d9f11..f59f4c2af2 100644 --- a/wsutil/Makefile.common +++ b/wsutil/Makefile.common @@ -51,7 +51,6 @@ LIBWSUTIL_SRC = \ des.c \ eax.c \ filesystem.c \ - floor.c \ g711.c \ glib_version_info.c \ md4.c \ @@ -104,7 +103,6 @@ libwsutil_nonrepl_INCLUDES = \ des.h \ eax.h \ filesystem.h \ - floor.h \ g711.h \ glib_version_info.h \ md4.h \ |