diff options
author | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2009-09-17 15:24:20 -0700 |
commit | 39971fff27f71b514308d10d7a2d8c3fb58c2420 (patch) | |
tree | 101f2adac9ef41af17579d22f6ddd56ada62ce5d /librpc/gen_ndr/dssetup.h | |
parent | 23676b6e9e8aad0ac2aa78d04e65f637b4551527 (diff) | |
parent | e71d9728f52e969e07927c5b38fa062c6ef6d1eb (diff) | |
download | samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.gz samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.tar.bz2 samba-39971fff27f71b514308d10d7a2d8c3fb58c2420.zip |
Merge branch 'master' of /home/tridge/samba/git/combined
Diffstat (limited to 'librpc/gen_ndr/dssetup.h')
-rw-r--r-- | librpc/gen_ndr/dssetup.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/librpc/gen_ndr/dssetup.h b/librpc/gen_ndr/dssetup.h index 5d254fe92e..f1d1332c6a 100644 --- a/librpc/gen_ndr/dssetup.h +++ b/librpc/gen_ndr/dssetup.h @@ -11,12 +11,12 @@ enum dssetup_DsRole #ifndef USE_UINT_ENUMS { - DS_ROLE_STANDALONE_WORKSTATION=0, - DS_ROLE_MEMBER_WORKSTATION=1, - DS_ROLE_STANDALONE_SERVER=2, - DS_ROLE_MEMBER_SERVER=3, - DS_ROLE_BACKUP_DC=4, - DS_ROLE_PRIMARY_DC=5 + DS_ROLE_STANDALONE_WORKSTATION=(int)(0), + DS_ROLE_MEMBER_WORKSTATION=(int)(1), + DS_ROLE_STANDALONE_SERVER=(int)(2), + DS_ROLE_MEMBER_SERVER=(int)(3), + DS_ROLE_BACKUP_DC=(int)(4), + DS_ROLE_PRIMARY_DC=(int)(5) } #else { __donnot_use_enum_dssetup_DsRole=0x7FFFFFFF} @@ -47,8 +47,8 @@ struct dssetup_DsRolePrimaryDomInfoBasic { enum dssetup_DsUpgrade #ifndef USE_UINT_ENUMS { - DS_ROLE_NOT_UPGRADING=0, - DS_ROLE_UPGRADING=1 + DS_ROLE_NOT_UPGRADING=(int)(0), + DS_ROLE_UPGRADING=(int)(1) } #else { __donnot_use_enum_dssetup_DsUpgrade=0x7FFFFFFF} @@ -60,9 +60,9 @@ enum dssetup_DsUpgrade enum dssetup_DsPrevious #ifndef USE_UINT_ENUMS { - DS_ROLE_PREVIOUS_UNKNOWN=0, - DS_ROLE_PREVIOUS_PRIMARY=1, - DS_ROLE_PREVIOUS_BACKUP=2 + DS_ROLE_PREVIOUS_UNKNOWN=(int)(0), + DS_ROLE_PREVIOUS_PRIMARY=(int)(1), + DS_ROLE_PREVIOUS_BACKUP=(int)(2) } #else { __donnot_use_enum_dssetup_DsPrevious=0x7FFFFFFF} @@ -80,9 +80,9 @@ struct dssetup_DsRoleUpgradeStatus { enum dssetup_DsRoleOp #ifndef USE_UINT_ENUMS { - DS_ROLE_OP_IDLE=0, - DS_ROLE_OP_ACTIVE=1, - DS_ROLE_OP_NEEDS_REBOOT=2 + DS_ROLE_OP_IDLE=(int)(0), + DS_ROLE_OP_ACTIVE=(int)(1), + DS_ROLE_OP_NEEDS_REBOOT=(int)(2) } #else { __donnot_use_enum_dssetup_DsRoleOp=0x7FFFFFFF} @@ -99,9 +99,9 @@ struct dssetup_DsRoleOpStatus { enum dssetup_DsRoleInfoLevel #ifndef USE_UINT_ENUMS { - DS_ROLE_BASIC_INFORMATION=1, - DS_ROLE_UPGRADE_STATUS=2, - DS_ROLE_OP_STATUS=3 + DS_ROLE_BASIC_INFORMATION=(int)(1), + DS_ROLE_UPGRADE_STATUS=(int)(2), + DS_ROLE_OP_STATUS=(int)(3) } #else { __donnot_use_enum_dssetup_DsRoleInfoLevel=0x7FFFFFFF} |