Fix detection of MARISA_WORD_SIZE #58
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Tested on Alpine Linux on:
|
This was referenced Apr 24, 2024
Closed
jmr
reviewed
Apr 24, 2024
ncopa
force-pushed
the
fix-wordsize-detection
branch
from
1e16775 to
6925413
Compare
Contributor
Author
|
I updated the commit to use It seems that Visual C++ 2010 and newer at least provides Maybe we should do something like: diff --git a/include/marisa/base.h b/include/marisa/base.h
index bddce4a..68e774b 100644
--- a/include/marisa/base.h
+++ b/include/marisa/base.h
@@ -2,7 +2,7 @@
#define MARISA_BASE_H_
// Old Visual C++ does not provide stdint.h.
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) || (_MSC_VER >= 1600)
#include <stdint.h>
#endif // _MSC_VER
|
ziyao233
added a commit
to ziyao233/eweos-packages
that referenced
this pull request
Aug 3, 2024
This makes detection of MARISA_WORD_SIZE architecture independent. Links: s-yata/marisa-trie#58
YukariChiba
pushed a commit
to eweOS/packages
that referenced
this pull request
Aug 4, 2024
This makes detection of MARISA_WORD_SIZE architecture independent. Links: s-yata/marisa-trie#58
Owner
|
Hmm... I cannot remember the reason why I used architecture dependent macros. I would like to merge this because it solves many similar issues and pull requests. |
Owner
|
I prefer to use UINT64_MAX and UINT32_MAX than 0xffffffffffffffff and 0xffffffff. |
s-yata
added a commit
that referenced
this pull request
May 16, 2025
marisa-trie assumes that stdint.h is available.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Detect the MARISA_WORD_SIZE independent of architecture.
Fixes: #40
Fixes: #57
Fixes: #44
Fixes: #46
Fixes: #56