Skip to content
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

Closed
wants to merge 4 commits into from
Closed

Minorfix #4756

wants to merge 4 commits into from

Conversation

@xiaoxiang781216
Copy link
Contributor

@xiaoxiang781216 xiaoxiang781216 commented Dec 24, 2019

Found when porting to NuttX

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>
@@ -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;

This comment has been minimized.

@jay

jay Dec 24, 2019
Member

why this?

This comment has been minimized.

@xiaoxiang781216

xiaoxiang781216 Dec 25, 2019
Author Contributor

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)

This comment has been minimized.

@jay

jay Dec 24, 2019
Member

Where is DEBUGASSERT already defined?

This comment has been minimized.

@xiaoxiang781216

xiaoxiang781216 Dec 25, 2019
Author Contributor

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.

@xiaoxiang781216 xiaoxiang781216 force-pushed the xiaoxiang781216:minorfix branch from 88439c7 to 90e7e56 Dec 25, 2019
@jay jay added the tidy-up label Dec 26, 2019
@jay jay closed this in 4b46399 Dec 28, 2019
jay added a commit that referenced this pull request Dec 28, 2019
Modified by commit eb9a604 accidentally.

Closes #4756
@jay
Copy link
Member

@jay jay commented Dec 28, 2019

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.

@lock lock bot locked as resolved and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.