summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-06-03 20:44:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:31 -0500
commit77c3d463c88af9f41f5f76446d380c80262ce712 (patch)
treece2cf3a04f94d8f8b72c74fb0296b053b23fedf6 /source4
parentad43b5cba966baf5f8057126d73a1bd68e3adde5 (diff)
downloadsamba-77c3d463c88af9f41f5f76446d380c80262ce712.tar.gz
samba-77c3d463c88af9f41f5f76446d380c80262ce712.tar.bz2
samba-77c3d463c88af9f41f5f76446d380c80262ce712.zip
r7248: Remove enum that is causing trouble on AIX
(This used to be commit 512536c9165eb4a630c8bf4e43e71def26006047)
Diffstat (limited to 'source4')
-rw-r--r--source4/include/registry.h20
-rw-r--r--source4/lib/registry/tools/regshell.c4
2 files changed, 11 insertions, 13 deletions
diff --git a/source4/include/registry.h b/source4/include/registry.h
index 05bcf76ad5..488d4f4dc6 100644
--- a/source4/include/registry.h
+++ b/source4/include/registry.h
@@ -23,17 +23,15 @@
#define _REGISTRY_H
/* Handles for the predefined keys */
-enum reg_predefined_key {
- HKEY_CLASSES_ROOT = 0x80000000,
- HKEY_CURRENT_USER = 0x80000001,
- HKEY_LOCAL_MACHINE = 0x80000002,
- HKEY_USERS = 0x80000003,
- HKEY_PERFORMANCE_DATA = 0x80000004,
- HKEY_CURRENT_CONFIG = 0x80000005,
- HKEY_DYN_DATA = 0x80000006,
- HKEY_PERFORMANCE_TEXT = 0x80000050,
- HKEY_PERFORMANCE_NLSTEXT= 0x80000060
-};
+#define HKEY_CLASSES_ROOT 0x80000000
+#define HKEY_CURRENT_USER 0x80000001
+#define HKEY_LOCAL_MACHINE 0x80000002
+#define HKEY_USERS 0x80000003
+#define HKEY_PERFORMANCE_DATA 0x80000004
+#define HKEY_CURRENT_CONFIG 0x80000005
+#define HKEY_DYN_DATA 0x80000006
+#define HKEY_PERFORMANCE_TEXT 0x80000050
+#define HKEY_PERFORMANCE_NLSTEXT 0x80000060
/* Registry data types */
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index f1fd740830..03cb09c443 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -408,7 +408,7 @@ static char **reg_completion(const char *text, int start, int end)
}
if (h) {
- enum reg_predefined_key try_hkeys[] = {
+ uint32_t try_hkeys[] = {
HKEY_CLASSES_ROOT,
HKEY_CURRENT_USER,
HKEY_LOCAL_MACHINE,
@@ -424,7 +424,7 @@ static char **reg_completion(const char *text, int start, int end)
for (i = 0; try_hkeys[i]; i++) {
WERROR err;
- err = reg_get_predefined_key(h, HKEY_CLASSES_ROOT, &curkey);
+ err = reg_get_predefined_key(h, try_hkeys[i], &curkey);
if (W_ERROR_IS_OK(err)) {
break;
} else {