diff options
| author | unknown <hartmut@mysql.com> | 2005-09-30 18:16:57 +0200 |
|---|---|---|
| committer | unknown <hartmut@mysql.com> | 2005-09-30 18:16:57 +0200 |
| commit | 7d3c939e81f8da8c9f57421864e07b4315f03f57 (patch) | |
| tree | e8f6638a94b8cca6df059c2a836b5b37761c6195 /server-tools/instance-manager/user_map.h | |
| parent | 0585fcbe639000fa9e4210e2a4149570268f8a72 (diff) | |
| parent | 39ba8376e6a3331a2c75fb3f9f5fbd6ff42f6a62 (diff) | |
| download | mariadb-git-7d3c939e81f8da8c9f57421864e07b4315f03f57.tar.gz | |
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
ndb/tools/ndb_config.cpp:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/user_map.h')
| -rw-r--r-- | server-tools/instance-manager/user_map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/user_map.h b/server-tools/instance-manager/user_map.h index 4c86edd93d9..a57174a37c3 100644 --- a/server-tools/instance-manager/user_map.h +++ b/server-tools/instance-manager/user_map.h @@ -16,7 +16,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifdef __GNUC__ +#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE) #pragma interface #endif |