-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Minorfix #4756
Minorfix #4756
Conversation
Change-Id: I015afcec67921fae6ffa2f55a6a65bff4e5a07f5 Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I96a966a252b62cd34dc2330d1a8d2abeee03a878 Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I41c2a55abd3a4f738568c42f1458c4f7f10a3a5f Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
modified by commit eb9a604 accidently Change-Id: I32ab5fa7f9caba29e29dfa15d5633a92a90c6bca Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
lib/asyn-thread.c
Outdated
@@ -667,7 +667,7 @@ int Curl_resolver_getsock(struct connectdata *conn, | |||
#endif | |||
ms = Curl_timediff(Curl_now(), reslv->start); | |||
if(ms < 3) | |||
milli = 0; | |||
milli = ms; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, we have a better fix. I remove this patch from pull request, pleaase ignore it.
@@ -374,6 +374,7 @@ typedef int sig_atomic_t; | |||
* Macro used to include assertion code only in debug builds. | |||
*/ | |||
|
|||
#undef DEBUGASSERT | |||
#if defined(DEBUGBUILD) && defined(HAVE_ASSERT_H) | |||
#define DEBUGASSERT(x) assert(x) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is DEBUGASSERT already defined?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Many OS or library define DEBUGASSERT, you can see here:
https://github.com/search?l=C&p=1&q=DEBUGASSERT&type=Code
One I really hit is:
https://github.com/apache/incubator-nuttx/blob/master/include/assert.h
Anyway, it isn't harmful to undefine it before define.
88439c7
to
90e7e56
Compare
Thanks. You may want to investigate why CURL_SIZEOF_CURL_OFF_T is <= 4. In most cases CURL_SIZEOF_CURL_OFF_T should be 8 because most compilers can support 64-bit curl_off_t even if the platform is 32-bit. |
Found when porting to NuttX