diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-11 15:25:05 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2017-12-11 15:25:05 +0100 |
commit | b2c5c74b7954279e8cc15790e168a1d4283b4e63 (patch) | |
tree | 94ad220d0362c25a42113e3e7e618b45e82056f0 | |
parent | fa003e1facb2ec5d45a28f27a0e293701c673ec6 (diff) | |
download | dabmod-b2c5c74b7954279e8cc15790e168a1d4283b4e63.tar.gz dabmod-b2c5c74b7954279e8cc15790e168a1d4283b4e63.tar.bz2 dabmod-b2c5c74b7954279e8cc15790e168a1d4283b4e63.zip |
Simplify porting.{h,c}
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/porting.c | 13 | ||||
-rw-r--r-- | src/porting.h | 20 |
3 files changed, 2 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac index 47e1c81..3a55d7b 100644 --- a/configure.ac +++ b/configure.ac @@ -192,7 +192,7 @@ AS_IF([test "x$enable_native" = "xyes"], ]) AC_TYPE_SIGNAL -AC_CHECK_FUNCS([bzero floor ftime gettimeofday memset sqrt strchr strerror strtol]) +AC_CHECK_FUNCS([floor memset sqrt strchr strerror strtol]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/src/porting.c b/src/porting.c index 79523e5..f7421b0 100644 --- a/src/porting.c +++ b/src/porting.c @@ -21,19 +21,6 @@ #include "porting.h" - -#ifndef HAVE_GETTIMEOFDAY -#include <sys/timeb.h> -int gettimeofday(struct timeval* t, void* timezone) -{ - struct timeb timebuffer; - ftime(&timebuffer); - t->tv_sec=timebuffer.time; - t->tv_usec=1000*timebuffer.millitm; - return 0; -} -#endif - #ifdef _WIN32 unsigned int _CRT_fmode = _O_BINARY; #endif diff --git a/src/porting.h b/src/porting.h index 2ac9b90..1799ba7 100644 --- a/src/porting.h +++ b/src/porting.h @@ -19,25 +19,12 @@ along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef PORTING_H -#define PORTING_H +#pragma once #ifdef HAVE_CONFIG_H # include <config.h> #endif -#ifndef HAVE_BZERO -# define bzero(s, n) memset(s, 0, n) -#endif - -#ifndef HAVE_GETTIMEOFDAY -#include <sys/time.h> -#ifdef __cplusplus -extern "C" -#endif -int gettimeofday(struct timeval* t, void* timezone); -#endif - #ifdef _WIN32 #include <fcntl.h> // For setting default opening mode with fopen as binary, for all files @@ -45,8 +32,3 @@ int gettimeofday(struct timeval* t, void* timezone); extern unsigned int _CRT_fmode; #endif -#ifndef HAVE_KILL -# define kill(a, b) raise(b) -#endif - -#endif // PORTING_H |