summaryrefslogtreecommitdiff
path: root/include/my_getopt.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-07-09 02:29:28 +0300
committermonty@mysql.com <>2004-07-09 02:29:28 +0300
commit064b8b8f65a4df3611199e5dcb418ebf0b8e8134 (patch)
treed39c3dfa90aad2f93012b09513ff0ba42c1aa0cb /include/my_getopt.h
parent949de54454a016fa8f05d872f7732678d3bac492 (diff)
parent801a24952e268e7152c42ae6bec6112037858624 (diff)
downloadmariadb-git-064b8b8f65a4df3611199e5dcb418ebf0b8e8134.tar.gz
Merge with 4.0 to get bug fixes
Diffstat (limited to 'include/my_getopt.h')
-rw-r--r--include/my_getopt.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/include/my_getopt.h b/include/my_getopt.h
index 5f4025efa0e..bf119892a31 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.h
@@ -16,10 +16,17 @@
C_MODE_START
-enum get_opt_var_type { GET_NO_ARG, GET_BOOL, GET_INT, GET_UINT, GET_LONG,
- GET_ULONG, GET_LL, GET_ULL, GET_STR, GET_STR_ALLOC,
- GET_DISABLED
- };
+#define GET_NO_ARG 1
+#define GET_BOOL 2
+#define GET_INT 3
+#define GET_UINT 4
+#define GET_LONG 5
+#define GET_ULONG 6
+#define GET_LL 7
+#define GET_ULL 8
+#define GET_STR 9
+#define GET_STR_ALLOC 10
+#define GET_DISABLED 11
#define GET_ASK_ADDR 128
#define GET_TYPE_MASK 127
@@ -34,7 +41,7 @@ struct my_option
gptr *value; /* The variable value */
gptr *u_max_value; /* The user def. max variable value */
const char **str_values; /* Pointer to possible values */
- enum get_opt_var_type var_type;
+ ulong var_type;
enum get_opt_arg_type arg_type;
longlong def_value; /* Default value */
longlong min_value; /* Min allowed value */