diff options
| author | kent@kent-amd64.(none) <> | 2006-12-27 02:24:40 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2006-12-27 02:24:40 +0100 |
| commit | 2a10b999076b3a0378545f68bbf46ee4fe75dbe3 (patch) | |
| tree | bd2ccb10df21dbf734ede36704fc7486bcc0f491 /include/atomic | |
| parent | 54133c7e38a14847b5d2efe2e553c9affe846cd5 (diff) | |
| parent | 1e3237fefa11f89318a51d8dcb39827ccc9d6180 (diff) | |
| download | mariadb-git-2a10b999076b3a0378545f68bbf46ee4fe75dbe3.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'include/atomic')
| -rw-r--r-- | include/atomic/nolock.h | 3 | ||||
| -rw-r--r-- | include/atomic/rwlock.h | 3 | ||||
| -rw-r--r-- | include/atomic/x86-gcc.h | 3 | ||||
| -rw-r--r-- | include/atomic/x86-msvc.h | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/include/atomic/nolock.h b/include/atomic/nolock.h index 1151a334b06..f15c8b13b7f 100644 --- a/include/atomic/nolock.h +++ b/include/atomic/nolock.h @@ -2,8 +2,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/atomic/rwlock.h b/include/atomic/rwlock.h index 12d0dd3f069..18b77e93d80 100644 --- a/include/atomic/rwlock.h +++ b/include/atomic/rwlock.h @@ -2,8 +2,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/atomic/x86-gcc.h b/include/atomic/x86-gcc.h index 5a72f318a61..d79dadbf05e 100644 --- a/include/atomic/x86-gcc.h +++ b/include/atomic/x86-gcc.h @@ -2,8 +2,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/include/atomic/x86-msvc.h b/include/atomic/x86-msvc.h index d4024a854fb..c4885bb8451 100644 --- a/include/atomic/x86-msvc.h +++ b/include/atomic/x86-msvc.h @@ -2,8 +2,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of |