mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-26 04:35:39 +03:00
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
--- a/source/libnormaliz/general.cpp
|
|
+++ b/source/libnormaliz/general.cpp
|
|
@@ -25,41 +25,6 @@
|
|
#include <csignal>
|
|
#include "libnormaliz/general.h"
|
|
|
|
-#ifndef _MSC_VER
|
|
-#include <sys/time.h>
|
|
-#else
|
|
-#define WIN32_LEAN_AND_MEAN
|
|
-#include <Windows.h>
|
|
-#include <stdint.h> // portable: uint64_t MSVC: __int64
|
|
-
|
|
-// MSVC defines this in winsock2.h!?
|
|
-typedef struct timeval {
|
|
- long tv_sec;
|
|
- long tv_usec;
|
|
-} timeval;
|
|
-
|
|
-int gettimeofday(struct timeval * tp, struct timezone * tzp)
|
|
-{
|
|
- // Note: some broken versions only have 8 trailing zero's, the correct epoch has 9 trailing zero's
|
|
- // This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
|
|
- // until 00:00:00 January 1, 1970
|
|
- static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);
|
|
-
|
|
- SYSTEMTIME system_time;
|
|
- FILETIME file_time;
|
|
- uint64_t time;
|
|
-
|
|
- GetSystemTime( &system_time );
|
|
- SystemTimeToFileTime( &system_time, &file_time );
|
|
- time = ((uint64_t)file_time.dwLowDateTime ) ;
|
|
- time += ((uint64_t)file_time.dwHighDateTime) << 32;
|
|
-
|
|
- tp->tv_sec = (long) ((time - EPOCH) / 10000000L);
|
|
- tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
|
|
- return 0;
|
|
-}
|
|
-#endif
|
|
-
|
|
namespace libnormaliz {
|
|
|
|
bool verbose = false;
|
|
--- a/source/libnormaliz/general.h
|
|
+++ b/source/libnormaliz/general.h
|
|
@@ -30,6 +30,7 @@
|
|
#include <cstddef>
|
|
#include <string>
|
|
#include <vector>
|
|
+#include <sys/time.h>
|
|
|
|
#include <libnormaliz/dynamic_bitset.h>
|