From f4cd3de9a4157d524375026ecdbebae5543107bf Mon Sep 17 00:00:00 2001 From: Tim Buktu Date: Sat, 14 May 2016 10:13:04 +0200 Subject: [PATCH] MinGW fixes This fixes errors that started popping up after a reinstall of MinGW. Presumably, things changed in recent MinGW versions. --- Makefile.win | 5 ++--- src/bench.c | 7 ------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Makefile.win b/Makefile.win index 8608539..e8d2641 100644 --- a/Makefile.win +++ b/Makefile.win @@ -11,7 +11,6 @@ endif ifeq ($(SSE), yes) CFLAGS+=-mssse3 endif -LIBS+=-lrt SRCDIR=src TESTDIR=tests LIB_OBJS=bitstring.o encparams.o hash.o idxgen.o key.o mgf.o ntru.o poly.o rand.o arith.o sha1.o sha2.o nist_ctr_drbg.o rijndael.o @@ -96,12 +95,12 @@ test: testham: clean lib $(TEST_OBJS_PATHS) @echo CFLAGS=$(CFLAGS) - $(CC) $(CFLAGS) -o testham.exe $(TEST_OBJS_PATHS) $(LDFLAGS) -L. -llibntru -lm + $(CC) $(CFLAGS) -o testham.exe $(TEST_OBJS_PATHS) $(LDFLAGS) -L. -llibntru -lm -lws2_32 testnoham: CFLAGS += -DNTRU_AVOID_HAMMING_WT_PATENT testnoham: clean lib $(TEST_OBJS_PATHS) @echo CFLAGS=$(CFLAGS) - $(CC) $(CFLAGS) -o testnoham.exe $(TEST_OBJS_PATHS) $(LDFLAGS) -L. -llibntru -lm + $(CC) $(CFLAGS) -o testnoham.exe $(TEST_OBJS_PATHS) $(LDFLAGS) -L. -llibntru -lm -lws2_32 bench: lib $(CC) $(CFLAGS) $(CPPFLAGS) -o bench $(SRCDIR)/bench.c $(LDFLAGS) -L. -llibntru diff --git a/src/bench.c b/src/bench.c index bb0983f..59f4e8b 100644 --- a/src/bench.c +++ b/src/bench.c @@ -56,13 +56,6 @@ the_time->tv_nsec = mts.tv_nsec; #define CLOCK_REALTIME 0 -/* POSIX.1b structure for a time value. This is like a `struct timeval' but -has nanoseconds instead of microseconds. */ -struct timespec { - uint32_t tv_sec; /* Seconds. */ - uint32_t tv_nsec; /* Nanoseconds. */ -}; - LARGE_INTEGER getFILETIMEoffset() { SYSTEMTIME s;