aboutsummaryrefslogtreecommitdiffstats
path: root/wsutil
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-04-04 23:06:50 +0100
committerJoão Valverde <j@v6e.pt>2016-04-04 23:58:31 +0000
commitcd1d1377430aa50fb1363fad7ab9de7026b4f716 (patch)
tree6f7cc9bc9be89b2bcf2657c068929aad226fcb28 /wsutil
parent74dccdc3b965b6d5144dca1ce15f19054f938046 (diff)
Avoid unnecessary replacement source file floorl.c
Change-Id: If282cb22dcf099559cbe8acd5b1affd07155af8c Reviewed-on: https://code.wireshark.org/review/14808 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
-rw-r--r--wsutil/Makefile.am4
-rw-r--r--wsutil/floorl.c38
-rw-r--r--wsutil/floorl.h36
3 files changed, 0 insertions, 78 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 6a50a89453..434457ccd8 100644
--- a/wsutil/Makefile.am
+++ b/wsutil/Makefile.am
@@ -72,10 +72,6 @@ libwsutil_la_SOURCES = \
$(LIBWSUTIL_SRC) \
$(LIBWSUTIL_INCLUDES)
-if !HAVE_FLOORL
-libwsutil_la_SOURCES += floorl.c floorl.h
-endif
-
libwsutil_sse42_la_SOURCES = \
ws_mempbrk_sse42.c
diff --git a/wsutil/floorl.c b/wsutil/floorl.c
deleted file mode 100644
index 28fae71598..0000000000
--- a/wsutil/floorl.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* floorl.c
- *
- * Provides floorl function for systems that do not provide it
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <math.h>
-
-#include "wsutil/floorl.h"
-
-#ifndef HAVE_FLOORL
-long double
-floorl(long double x)
-{
- /* Not perfect, but probably the best workaround available */
- return floor((double)x);
-}
-
-#endif /* !HAVE_FLOORL */
diff --git a/wsutil/floorl.h b/wsutil/floorl.h
deleted file mode 100644
index 1af066b4a1..0000000000
--- a/wsutil/floorl.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* floorl.h
- *
- * Declares floorl function for systems that do not provide it
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __FLOORL_H__
-#define __FLOORL_H__
-
-#include "config.h"
-
-#include "ws_symbol_export.h"
-
-/*
- * Version of "floorl()", for the benefit of OSes that don't have it.
- */
-WS_DLL_PUBLIC long double floorl(long double x);
-
-#endif /* __FLOORL_H__ */