summaryrefslogtreecommitdiff
path: root/librpc/gen_ndr/winreg.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-10-17 10:36:33 -0700
committerJeremy Allison <jra@samba.org>2009-10-17 10:36:33 -0700
commit7c51fa6d699a653cafa90df8e44911b576118ebd (patch)
tree543bf9ca698e03eff81104898b33e77f1abed319 /librpc/gen_ndr/winreg.h
parentcc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff)
parent3e3214fd91471bca5b6c4d3782e922d252d588fb (diff)
downloadsamba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz
samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2
samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'librpc/gen_ndr/winreg.h')
-rw-r--r--librpc/gen_ndr/winreg.h34
1 files changed, 1 insertions, 33 deletions
diff --git a/librpc/gen_ndr/winreg.h b/librpc/gen_ndr/winreg.h
index 9962927008..7116810708 100644
--- a/librpc/gen_ndr/winreg.h
+++ b/librpc/gen_ndr/winreg.h
@@ -6,6 +6,7 @@
#include "librpc/gen_ndr/lsa.h"
#include "librpc/gen_ndr/security.h"
+#include "librpc/gen_ndr/misc.h"
#ifndef _HEADER_winreg
#define _HEADER_winreg
@@ -23,39 +24,6 @@
#define KEY_WOW64_64KEY ( 0x00100 )
#define KEY_WOW64_32KEY ( 0x00200 )
-enum winreg_Type
-#ifndef USE_UINT_ENUMS
- {
- REG_NONE=(int)(0),
- REG_SZ=(int)(1),
- REG_EXPAND_SZ=(int)(2),
- REG_BINARY=(int)(3),
- REG_DWORD=(int)(4),
- REG_DWORD_BIG_ENDIAN=(int)(5),
- REG_LINK=(int)(6),
- REG_MULTI_SZ=(int)(7),
- REG_RESOURCE_LIST=(int)(8),
- REG_FULL_RESOURCE_DESCRIPTOR=(int)(9),
- REG_RESOURCE_REQUIREMENTS_LIST=(int)(10),
- REG_QWORD=(int)(11)
-}
-#else
- { __donnot_use_enum_winreg_Type=0x7FFFFFFF}
-#define REG_NONE ( 0 )
-#define REG_SZ ( 1 )
-#define REG_EXPAND_SZ ( 2 )
-#define REG_BINARY ( 3 )
-#define REG_DWORD ( 4 )
-#define REG_DWORD_BIG_ENDIAN ( 5 )
-#define REG_LINK ( 6 )
-#define REG_MULTI_SZ ( 7 )
-#define REG_RESOURCE_LIST ( 8 )
-#define REG_FULL_RESOURCE_DESCRIPTOR ( 9 )
-#define REG_RESOURCE_REQUIREMENTS_LIST ( 10 )
-#define REG_QWORD ( 11 )
-#endif
-;
-
struct winreg_String {
uint16_t name_len;/* [value(strlen_m_term(name)*2)] */
uint16_t name_size;/* [value(strlen_m_term(name)*2)] */