| author | Petr Nyc <Petr.Nyc@Oracle.COM> |
| Fri, 18 Sep 2015 00:26:21 -0400 | |
| branch | s11u3-sru |
| changeset 4874 | 3c3d9a5b5065 |
| parent 444 | a2a87847a213 |
| permissions | -rw-r--r-- |
|
444
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
1 |
--- storage/innobase/include/univ.i Mon Jul 13 16:12:14 2009 |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
2 |
+++ storage/innobase/include/univ.i.org Thu May 12 23:27:42 2011 |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
3 |
@@ -56,9 +56,9 @@ |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
4 |
# endif |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
5 |
|
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
6 |
/* We only try to do explicit inlining of functions with gcc and |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
7 |
-Microsoft Visual C++ */ |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
8 |
+Microsoft Visual C++ and Oracle Compilers */ |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
9 |
|
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
10 |
-# if !defined(__GNUC__) |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
11 |
+# if !defined(__GNUC__) && !defined(__SUNWSPRO_C) |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
12 |
# undef UNIV_MUST_NOT_INLINE /* Remove compiler warning */ |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
13 |
# define UNIV_MUST_NOT_INLINE |
|
a2a87847a213
7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff
changeset
|
14 |
# endif |