diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:47:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 17:54:04 +0300 |
| commit | 26a14ee1308df65ebb9dda9a8618e64f2f2fc518 (patch) | |
| tree | 7cad4dffc5fb9f0a8caff5fd62c95a3a8e65ffa8 /include/atomic | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-26a14ee1308df65ebb9dda9a8618e64f2f2fc518.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'include/atomic')
| -rw-r--r-- | include/atomic/gcc_builtins.h | 2 | ||||
| -rw-r--r-- | include/atomic/generic-msvc.h | 2 | ||||
| -rw-r--r-- | include/atomic/solaris.h | 2 | ||||
| -rw-r--r-- | include/atomic/x86-gcc.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/atomic/gcc_builtins.h b/include/atomic/gcc_builtins.h index 56a0323aedf..dd19ccd9ed6 100644 --- a/include/atomic/gcc_builtins.h +++ b/include/atomic/gcc_builtins.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #define make_atomic_add_body(S) \ v= __sync_fetch_and_add(a, v); diff --git a/include/atomic/generic-msvc.h b/include/atomic/generic-msvc.h index 6c5272c98f4..754f0bfa8b4 100644 --- a/include/atomic/generic-msvc.h +++ b/include/atomic/generic-msvc.h @@ -12,7 +12,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef _atomic_h_cleanup_ #define _atomic_h_cleanup_ "atomic/generic-msvc.h" diff --git a/include/atomic/solaris.h b/include/atomic/solaris.h index 7b6f0561ff0..cac34040993 100644 --- a/include/atomic/solaris.h +++ b/include/atomic/solaris.h @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ #ifndef _atomic_h_cleanup_ #define _atomic_h_cleanup_ "atomic/solaris.h" diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h index 3a081d9bbc5..18aa9b65c17 100644 --- a/include/atomic/x86-gcc.h +++ b/include/atomic/x86-gcc.h @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */ /* XXX 64-bit atomic operations can be implemented using |