Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 21:59:18 +0000 (22:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Dec 2008 21:59:18 +0000 (22:59 +0100)
librpc/gen_ndr/drsblobs.h
librpc/gen_ndr/nbt.h
librpc/gen_ndr/netlogon.h
librpc/gen_ndr/samr.h
librpc/gen_ndr/wkssvc.h
pidl/lib/Parse/Pidl/Samba4/Header.pm

index 692746468e8c433407f15091ea6a6914f937a5f1..f8fd304d3d796f691fbda887602768353476195c 100644 (file)
 #define _HEADER_drsblobs
 
 #define SUPPLEMENTAL_CREDENTIALS_PREFIX        ( "                                                " )
-enum drsuapi_DsAttributeId;
-
-enum lsa_TrustAuthType;
-
 struct replPropertyMetaData1 {
        enum drsuapi_DsAttributeId attid;
        uint32_t version;
index 4b872d7936e82dbb46913423bda15f0e38980087..a8c66a67958e3577458ad2e62fbd3ff01202eba1 100644 (file)
@@ -534,8 +534,6 @@ struct nbt_netlogon_response_from_pdc {
        uint16_t lm20_token;
 }/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
 
-enum netr_SamDatabaseID;
-
 struct nbt_db_change_info {
        enum netr_SamDatabaseID db_index;
        uint64_t serial;
index 7fb253446a60cf812ecd837e37d8458242c9f8b7..b4de53bf7b048e829b0201661fc09216bcfdc7e8 100644 (file)
 
 #define DSGETDC_VALID_FLAGS    ( (DS_FORCE_REDISCOVERY|DS_DIRECTORY_SERVICE_REQUIRED|DS_DIRECTORY_SERVICE_PREFERRED|DS_GC_SERVER_REQUIRED|DS_PDC_REQUIRED|DS_BACKGROUND_ONLY|DS_IP_REQUIRED|DS_KDC_REQUIRED|DS_TIMESERV_REQUIRED|DS_WRITABLE_REQUIRED|DS_GOOD_TIMESERV_PREFERRED|DS_AVOID_SELF|DS_ONLY_LDAP_NEEDED|DS_IS_FLAT_NAME|DS_IS_DNS_NAME|DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME) )
 #define DS_GFTI_UPDATE_TDO     ( 0x1 )
-enum netr_DeltaEnum8Bit;
-
-enum netr_SamDatabaseID8Bit;
-
 struct netr_UasInfo {
        const char *account_name;/* [unique,charset(UTF16)] */
        uint32_t priv;
@@ -251,10 +247,6 @@ struct netr_Authenticator {
        time_t timestamp;
 }/* [public] */;
 
-enum netr_SchannelType;
-
-enum netr_SamDatabaseID;
-
 struct netr_DELTA_DELETE_USER {
        const char *account_name;/* [unique,charset(UTF16)] */
        struct lsa_String unknown1;
index 3116f26d8cb12819d402e45a9e5260c1b50d5b9d..782987de1cbb057cee6e145fb63100b098ae6520 100644 (file)
@@ -698,8 +698,6 @@ enum samr_ConnectVersion
 #endif
 ;
 
-enum samr_RejectReason;
-
 struct samr_ChangeReject {
        enum samr_RejectReason reason;
        uint32_t unknown1;
index 07b4c40e833b5b3751c0fc049d7fd2165a7cfed1..dc12fe2a3f6f1ccd55e62f6d902f0228493d4339 100644 (file)
@@ -7,8 +7,6 @@
 #ifndef _HEADER_wkssvc
 #define _HEADER_wkssvc
 
-enum srvsvc_PlatformId;
-
 struct wkssvc_NetWkstaInfo100 {
        enum srvsvc_PlatformId platform_id;
        const char *server_name;/* [unique,charset(UTF16)] */
index 611f0adb92cc0cf99d798397f79978d7196bd99f..94e1efbfe4925a201c17643b3ea3e28821b103e6 100644 (file)
@@ -226,6 +226,8 @@ sub HeaderType($$$;$)
 sub HeaderTypedef($;$)
 {
        my($typedef,$tail) = @_;
+       # Don't print empty "enum foo;", since some compilers don't like it.
+       return if ($typedef->{DATA}->{TYPE} eq "ENUM" and not defined($typedef->{DATA}->{ELEMENTS}));
        HeaderType($typedef, $typedef->{DATA}, $typedef->{NAME}, $tail) if defined ($typedef->{DATA});
 }