diff options
| author | Alex Deymo <deymo@google.com> | 2018-01-08 20:49:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-08 20:49:55 +0000 |
| commit | d6cc5657f76e9d919cb763997c725dac3d737bfe (patch) | |
| tree | 10f2cc17311582d8f1b00ecf3ab0c4af213b839d /lib/splay.h | |
| parent | aae00d53fb85eb5e1a4b768f0c353c4e5884baff (diff) | |
| parent | fb9bb4b2ab398c43e78c91e514b108e0ed83520d (diff) | |
| download | android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.tar.gz android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.tar.bz2 android_external_curl-d6cc5657f76e9d919cb763997c725dac3d737bfe.zip | |
Merge "Update from 7.55.1 to 7.57.0" am: 96660a18c5 am: 484d473385
am: fb9bb4b2ab
Change-Id: Ibdd1eef03d7087e66dc85d29773988cd9a3f9d3e
Diffstat (limited to 'lib/splay.h')
| -rw-r--r-- | lib/splay.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/splay.h b/lib/splay.h index 0273bad..4612ec2 100644 --- a/lib/splay.h +++ b/lib/splay.h @@ -54,8 +54,8 @@ int Curl_splayremovebyaddr(struct Curl_tree *t, struct Curl_tree *removenode, struct Curl_tree **newroot); -#define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \ - ( ((i.tv_sec) > (j.tv_sec)) ? 1 : \ +#define Curl_splaycomparekeys(i,j) ( ((i.tv_sec) < (j.tv_sec)) ? -1 : \ + ( ((i.tv_sec) > (j.tv_sec)) ? 1 : \ ( ((i.tv_usec) < (j.tv_usec)) ? -1 : \ ( ((i.tv_usec) > (j.tv_usec)) ? 1 : 0)))) |