diff options
| author | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-25 02:47:25 +0300 |
| commit | 54a32091a13923471c1e1639edd0390ed19bc70f (patch) | |
| tree | cd40ef99e52fbe99be97d88ef663df2fa69b8ddb /sql/mysqld_suffix.h | |
| parent | 8855e70bb4affb3c75c8175491a977a2ebbd30df (diff) | |
| parent | 072d10443abaea2b78cbe3b60d334234ea2580df (diff) | |
| download | mariadb-git-54a32091a13923471c1e1639edd0390ed19bc70f.tar.gz | |
Merge with 4.0 to get fixes for Windows project files
VC++Files/client/mysql.dsp:
Auto merged
VC++Files/client/mysqladmin.dsp:
Auto merged
VC++Files/client/mysqldump.dsp:
Auto merged
VC++Files/mysql.dsw:
Auto merged
VC++Files/client/mysqlimport.dsp:
Auto merged
VC++Files/client/mysqlshow.dsp:
Auto merged
VC++Files/isamchk/isamchk.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
Auto merged
VC++Files/myisamchk/myisamchk.dsp:
Auto merged
VC++Files/myisamlog/myisamlog.dsp:
Auto merged
VC++Files/myisampack/myisampack.dsp:
Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/pack_isam/pack_isam.dsp:
Auto merged
VC++Files/perror/perror.dsp:
Auto merged
VC++Files/replace/replace.dsp:
Auto merged
include/my_global.h:
Auto merged
include/mysql_version.h.in:
Auto merged
innobase/eval/eval0eval.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
libmysql/libmysql.c:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/mysqld_suffix.h')
| -rw-r--r-- | sql/mysqld_suffix.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/sql/mysqld_suffix.h b/sql/mysqld_suffix.h index 502cdeed75f..405c5d855b7 100644 --- a/sql/mysqld_suffix.h +++ b/sql/mysqld_suffix.h @@ -15,24 +15,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ /* - Set MYSQL_SERVER_SUFFIX - The following code is quite ugly as there is no portable way to set a + Set MYSQL_SERVER_SUFFIX_STR + The following code is quite ugly as there is no portable way to easily set a string to the value of a macro */ -#if defined(MYSQL_SERVER_SUFFIX_NT) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-nt" -#elif defined(MYSQL_SERVER_SUFFIX_MAX) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-max" -#elif defined(MYSQL_SERVER_SUFFIX_NT_MAX) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-nt-max" -#elif defined(MYSQL_SERVER_SUFFIX_PRO) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-pro" -#elif defined(MYSQL_SERVER_SUFFIX_PRO_NT) -#undef MYSQL_SERVER_SUFFIX -#define MYSQL_SERVER_SUFFIX "-pro-nt" +#ifdef MYSQL_SERVER_SUFFIX +#define MYSQL_SERVER_SUFFIX_STR STRINGIFY_ARG(MYSQL_SERVER_SUFFIX) +#else +#define MYSQL_SERVER_SUFFIX_STR MYSQL_SERVER_SUFFIX_DEF #endif |