diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 22:50:59 +0100 |
| commit | 271fed41061e25faa47b7a28108cf101ebb3551d (patch) | |
| tree | 733bf84d468a1d47c71c87cfcee33098a090e3c5 /mysys/my_gethwaddr.c | |
| parent | ff26d93a8c25d667709180ad13a090309631990d (diff) | |
| parent | e1385f2083f782d7064db3c0059fcca45bfcb2a4 (diff) | |
| download | mariadb-git-271fed41061e25faa47b7a28108cf101ebb3551d.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'mysys/my_gethwaddr.c')
| -rw-r--r-- | mysys/my_gethwaddr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c index 208f2ff902a..0fad7f90552 100644 --- a/mysys/my_gethwaddr.c +++ b/mysys/my_gethwaddr.c @@ -72,7 +72,7 @@ err: return res; } -#elif defined(__linux__) || defined(__sun__) +#elif defined(__linux__) || defined(__sun) #include <net/if.h> #include <sys/ioctl.h> #include <net/if_arp.h> |