From b6cb800dbec8081be8c4d19c639e6d2f8d570ad7 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 3 Jun 2001 09:03:24 +0200 Subject: [PATCH] misplaced #ifdef fixed BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted --- BitKeeper/etc/logging_ok | 1 + sql/mysqld.cc | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 50fea447bdd..f221c93999b 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1,3 +1,4 @@ jani@janikt.pp.saunalahti.fi monty@hundin.mysql.fi mwagner@evoq.mwagner.org +serg@serg.mysql.com diff --git a/sql/mysqld.cc b/sql/mysqld.cc index b009387f5c0..4390ff6455d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -87,17 +87,16 @@ int deny_severity = LOG_WARNING; #include #endif +#ifdef _AIX41 +int initgroups(const char *,int); +#endif + #if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) #include #ifdef HAVE_FP_EXCEPT // Fix type conflict typedef fp_except fp_except_t; #endif -#ifdef _AIX41 -extern "C" int initgroups(const char *,int); -#endif - - /* We can't handle floating point expections with threads, so disable this on freebsd */