diff options
| author | Magne Mahre <magne.mahre@oracle.com> | 2011-03-29 14:43:49 +0200 |
|---|---|---|
| committer | Magne Mahre <magne.mahre@oracle.com> | 2011-03-29 14:43:49 +0200 |
| commit | 517c5c247c217203e075a0f8b61e614e8dc6623f (patch) | |
| tree | 3b6d0fd06e191c69e6e0da8a63e81166e5b90513 /include/my_global.h | |
| parent | f239fa302cd4acc97c406ae071cefc903bb5de79 (diff) | |
| download | mariadb-git-517c5c247c217203e075a0f8b61e614e8dc6623f.tar.gz | |
Bug#11933945 REMOVE LGPL LICENSED FILES IN MYSQL 5.5
The LGPL license is used in some legacy code, and to
adhere to current licensing polity, we remove those
files that are no longer used, and reorganize the
remaining LGPL code so it will be GPL licensed from
now on.
Note: This patch only removed LGPL licensed files
in MySQL 5.5 and later, and is the third of a
set of patches to remove LGPL from all trees.
(See Bug# 11840513 for details)
Diffstat (limited to 'include/my_global.h')
| -rw-r--r-- | include/my_global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/my_global.h b/include/my_global.h index 02f4eb596d0..9ae70b3bcc7 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB, 2009 Sun Microsystems, Inc +/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. 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 @@ -285,7 +285,7 @@ C_MODE_END #define ulonglong2double(A) my_ulonglong2double(A) #define my_off_t2double(A) my_ulonglong2double(A) C_MODE_START -double my_ulonglong2double(unsigned long long A); +inline double my_ulonglong2double(unsigned long long A) { return (double A); } C_MODE_END #endif /* _AIX */ |