-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #375 from stuartjamesmcnicholas/64-bit
64 bit
- Loading branch information
Showing
8 changed files
with
127 additions
and
36 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#define IEEE_8087 | ||
#define Arith_Kind_ASL 1 | ||
#define Long int | ||
#define Intcast (int)(long) | ||
#define Double_Align | ||
#define X64_bit_pointers | ||
#define NANCHECK | ||
#define QNaN0 0x0 | ||
#define QNaN1 0xfff80000 |
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/coot-utils/slurp-map.cc b/coot-utils/slurp-map.cc | ||
index a432676fc..f1b60b823 100644 | ||
--- a/coot-utils/slurp-map.cc | ||
+++ b/coot-utils/slurp-map.cc | ||
@@ -110,12 +110,14 @@ coot::util::slurp_fill_xmap_from_map_file(const std::string &file_name, | ||
|
||
bool is_gzip = false; | ||
std::string ext = file_name_extension(file_name); | ||
+#if !((__POINTER_WIDTH__==64) && __EMSCRIPTEN__) | ||
if (ext == ".gz") is_gzip = true; | ||
|
||
if (is_gzip) { | ||
// this can fail (at the moment) if the axes are not in X,Y,Z order | ||
status = slurp_fill_xmap_from_gz_map_file(file_name, xmap_p, check_only); | ||
} else { | ||
+#endif | ||
// 20231006-PE as it used to be. | ||
struct stat s; | ||
int fstat = stat(file_name.c_str(), &s); | ||
@@ -139,7 +141,9 @@ coot::util::slurp_fill_xmap_from_map_file(const std::string &file_name, | ||
} | ||
delete [] space; | ||
} | ||
+#if !((__POINTER_WIDTH__==64) && __EMSCRIPTEN__) | ||
} | ||
+#endif | ||
} else { | ||
std::cout << "WARNING:: file does not exist " << file_name << std::endl; | ||
} |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/third_party/stb_sprintf.h b/third_party/stb_sprintf.h | ||
index 28e9d64b..27429a8c 100644 | ||
--- a/third_party/stb_sprintf.h | ||
+++ b/third_party/stb_sprintf.h | ||
@@ -230,7 +230,7 @@ STBSP__PUBLICDEC void STB_SPRINTF_DECORATE(set_separators)(char comma, char peri | ||
#define stbsp__uint16 unsigned short | ||
|
||
#ifndef stbsp__uintptr | ||
-#if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) || defined(__s390x__) | ||
+#if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) || defined(__s390x__) || ((__POINTER_WIDTH__==64) && defined(__EMSCRIPTEN__)) | ||
#define stbsp__uintptr stbsp__uint64 | ||
#else | ||
#define stbsp__uintptr stbsp__uint32 |
This file contains 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
This file contains 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