sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

r7248: Remove enum that is causing trouble on AIX

Browse Source
This commit is contained in:
Jelmer Vernooij 2005-06-03 20:44:46 +00:00 committed by Gerald (Jerry) Carter
parent 702a4dd2dc
commit 512536c916
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/include/registry.h
View File

@ -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 */

4
source/lib/registry/tools/regshell.c
View File

@ -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 {