Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee8eb94b1bd0
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 689a4e5f6e97
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 10, 2014

  1. Fix X86 MACROs

    It is necessary to not consider
    64bit architecture as always X86.
    Gustavo Frederico Temple Pedrosa committed Nov 10, 2014
    Copy the full SHA
    369533f View commit details

Commits on Nov 28, 2014

  1. Merge pull request #3193 from gustavotemple/fix-atomic-macros

    Fix X86 MACRO
    brixen committed Nov 28, 2014
    Copy the full SHA
    689a4e5 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 vm/include/capi/rbxti/atomic.hpp
2 changes: 1 addition & 1 deletion vm/include/capi/rbxti/atomic.hpp
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4))
#define GCC_BARRIER 1

#elif defined(_LP64) || defined(__LP64__) || defined(__x86_64__) || defined(__amd64__)
#elif (defined(_LP64) || defined(__LP64__)) && (defined(__x86_64__) || defined(__amd64__))
#define X86_BARRIER 1

#elif defined(i386) || defined(__i386) || defined(__i386__)