Merge branch 'master' of /home/tridge/samba/git/combined

1 files changed, 17 insertions, 17 deletions

diff --git a/librpc/gen_ndr/srvsvc.h b/librpc/gen_ndr/srvsvc.h
index 4a8fd051f6..be3dae4fd3 100644
--- a/librpc/gen_ndr/srvsvc.h
+++ b/librpc/gen_ndr/srvsvc.h
@@ -239,18 +239,18 @@ struct srvsvc_NetSessInfoCtr {
 enum srvsvc_ShareType
 #ifndef USE_UINT_ENUMS
  {
-	STYPE_DISKTREE=0,
-	STYPE_DISKTREE_TEMPORARY=STYPE_DISKTREE|STYPE_TEMPORARY,
-	STYPE_DISKTREE_HIDDEN=STYPE_DISKTREE|STYPE_HIDDEN,
-	STYPE_PRINTQ=1,
-	STYPE_PRINTQ_TEMPORARY=STYPE_PRINTQ|STYPE_TEMPORARY,
-	STYPE_PRINTQ_HIDDEN=STYPE_PRINTQ|STYPE_HIDDEN,
-	STYPE_DEVICE=2,
-	STYPE_DEVICE_TEMPORARY=STYPE_DEVICE|STYPE_TEMPORARY,
-	STYPE_DEVICE_HIDDEN=STYPE_DEVICE|STYPE_HIDDEN,
-	STYPE_IPC=3,
-	STYPE_IPC_TEMPORARY=STYPE_IPC|STYPE_TEMPORARY,
-	STYPE_IPC_HIDDEN=STYPE_IPC|STYPE_HIDDEN
+	STYPE_DISKTREE=(int)(0),
+	STYPE_DISKTREE_TEMPORARY=(int)(STYPE_DISKTREE|STYPE_TEMPORARY),
+	STYPE_DISKTREE_HIDDEN=(int)(STYPE_DISKTREE|STYPE_HIDDEN),
+	STYPE_PRINTQ=(int)(1),
+	STYPE_PRINTQ_TEMPORARY=(int)(STYPE_PRINTQ|STYPE_TEMPORARY),
+	STYPE_PRINTQ_HIDDEN=(int)(STYPE_PRINTQ|STYPE_HIDDEN),
+	STYPE_DEVICE=(int)(2),
+	STYPE_DEVICE_TEMPORARY=(int)(STYPE_DEVICE|STYPE_TEMPORARY),
+	STYPE_DEVICE_HIDDEN=(int)(STYPE_DEVICE|STYPE_HIDDEN),
+	STYPE_IPC=(int)(3),
+	STYPE_IPC_TEMPORARY=(int)(STYPE_IPC|STYPE_TEMPORARY),
+	STYPE_IPC_HIDDEN=(int)(STYPE_IPC|STYPE_HIDDEN)
 }
 #else
  { __donnot_use_enum_srvsvc_ShareType=0x7FFFFFFF}
@@ -414,11 +414,11 @@ struct srvsvc_NetShareInfoCtr {
 enum srvsvc_PlatformId
 #ifndef USE_UINT_ENUMS
  {
-	PLATFORM_ID_DOS=300,
-	PLATFORM_ID_OS2=400,
-	PLATFORM_ID_NT=500,
-	PLATFORM_ID_OSF=600,
-	PLATFORM_ID_VMS=700
+	PLATFORM_ID_DOS=(int)(300),
+	PLATFORM_ID_OS2=(int)(400),
+	PLATFORM_ID_NT=(int)(500),
+	PLATFORM_ID_OSF=(int)(600),
+	PLATFORM_ID_VMS=(int)(700)
 }
 #else
  { __donnot_use_enum_srvsvc_PlatformId=0x7FFFFFFF}