svn commit: samba r7248 - in branches/SAMBA_4_0/source: include lib/registry/tools

[jelmer at samba.org]

Author: jelmer
Date: 2005-06-03 20:44:46 +0000 (Fri, 03 Jun 2005)
New Revision: 7248

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7248

Log:
Remove enum that is causing trouble on AIX

Modified:
   branches/SAMBA_4_0/source/include/registry.h
   branches/SAMBA_4_0/source/lib/registry/tools/regshell.c


Changeset:
Modified: branches/SAMBA_4_0/source/include/registry.h
===================================================================
--- branches/SAMBA_4_0/source/include/registry.h	2005-06-03 19:09:21 UTC (rev 7247)
+++ branches/SAMBA_4_0/source/include/registry.h	2005-06-03 20:44:46 UTC (rev 7248)
@@ -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 */
 

Modified: branches/SAMBA_4_0/source/lib/registry/tools/regshell.c
===================================================================
--- branches/SAMBA_4_0/source/lib/registry/tools/regshell.c	2005-06-03 19:09:21 UTC (rev 7247)
+++ branches/SAMBA_4_0/source/lib/registry/tools/regshell.c	2005-06-03 20:44:46 UTC (rev 7248)
@@ -408,7 +408,7 @@
 	}
 
 	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 @@
 
 		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 {