Skip to content

Commit 250785e

Browse files
committed
Replace __x86_64__ by R__x86_64__ on Win64
Replace `__x86_64__` by `R__x86_64__` on Win64 to prevent possible conflicts, as [reported on the forum](https://root-forum.cern.ch/t/preprocessor-macro-x86-64-problem-with-clhep-on-windows/50431)
1 parent f841b96 commit 250785e

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

build/win/w32pragma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#define G__WIN32 1
6868

6969
#ifdef _WIN64
70-
#define __x86_64__ 1
70+
#define R__x86_64__ 1
7171
#define WIN64 1
7272
#define G__WIN64 1
7373
#else

core/foundation/inc/ROOT/RConfig.hxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@
392392
# ifndef WIN64
393393
# define WIN64
394394
# endif
395-
# define __x86_64__ 1
395+
# define R__x86_64__ 1
396396
# define R__B64 /* enable when 64 bit machine */
397397
#endif
398398

0 commit comments

Comments
 (0)