Permalink
Browse files

use BSD timersub

  • Loading branch information...
WinterMute committed May 16, 2012
1 parent 4080a3e commit 299c5d272f58c7cb803d6a61ca16d9551c7697e5
Showing with 12 additions and 11 deletions.
  1. +12 −11 src/stlink-usb.c
View
@@ -16,17 +16,18 @@
#define WLOG(format, args...) ugly_log(UWARN, LOG_TAG, format, ## args)
#define fatal(format, args...) ugly_log(UFATAL, LOG_TAG, format, ## args)
-#ifndef timersub
-/* This is a copy from GNU C Library (GNU LGPL 2.1), sys/time.h. */
-# define timersub(a, b, result) \
- do { \
- (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
- (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
- if ((result)->tv_usec < 0) { \
- --(result)->tv_sec; \
- (result)->tv_usec += 1000000; \
- } \
- } while (0)
+/* code from bsd timersub.h
+http://www.gnu-darwin.org/www001/src/ports/net/libevnet/work/libevnet-0.3.8/libnostd/bsd/sys/time/timersub.h.html
+*/
+#if !defined timersub
+#define timersub(a, b, r) do { \
+ (r)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
+ (r)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+ if ((r)->tv_usec < 0) { \
+ --(r)->tv_sec; \
+ (r)->tv_usec += 1000000; \
+ } \
+} while (0)
#endif
enum SCSI_Generic_Direction {SG_DXFER_TO_DEV=0, SG_DXFER_FROM_DEV=0x80};

0 comments on commit 299c5d2

Please sign in to comment.