r14380: Reduce the size of structs.h

(This used to be commit 1a16a6f1dfa66499af43a6b88b3ea69a6a75f1fe)

2 files changed, 1 insertions, 138 deletions

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 4ff67791f9..1a2ff68359 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -122,11 +122,7 @@ enum brl_type {
 #include "libcli/nbt/libnbt.h"
 #include "libcli/util/proto.h"
 
-#undef _PRINTF_ATTRIBUTE
-#define _PRINTF_ATTRIBUTE(a1, a2)
-
 /* String routines */
-
 #include "util/safe_string.h"
 
 #if 0
diff --git a/source4/include/structs.h b/source4/include/structs.h
index 124d97f493..19a811da9f 100644
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -23,143 +23,10 @@
   "scope is only this definition or declaration" warning
 */
 
-struct spoolss_EnumPrinters;
-struct spoolss_EnumForms;
-struct spoolss_EnumJobs;
-struct spoolss_EnumPrinterDrivers;
-struct spoolss_EnumPorts;
-struct spoolss_EnumMonitors;
-struct spoolss_EnumPrintProcessors;
-union spoolss_PrinterInfo;
-union spoolss_JobInfo;
-union spoolss_DriverInfo;
-union spoolss_FormInfo;
-union spoolss_PortInfo;
-union spoolss_MonitorInfo;
-union spoolss_PrintProcessorInfo;
-
-struct spoolss_GetPrinterData;
-struct spoolss_SetPrinterData;
-
-struct spoolss_DeviceMode;
-
-struct drsuapi_DsNameInfo1;
-struct drsuapi_DsCrackNames;
-struct drsuapi_DsReplicaObjectListItem;
-struct drsuapi_DsReplicaObjectListItemEx;
-
-struct DsPrivate;
-
-struct PAC_LOGON_INFO;
-struct PAC_DATA;
-struct PAC_BUFFER;
-
-struct samr_ChangePasswordUser;
-struct samr_OemChangePasswordUser2;
-struct samr_ChangePasswordUser3;
-struct samr_ChangePasswordUser2;
-struct samr_CryptPassword;
-struct samr_CryptPasswordEx;
-struct samr_DomInfo1;
-
-struct netr_Credential;
-struct netr_Authenticator;
-union netr_Validation;
-
-struct iface_struct;
-
-struct utimbuf;
-
-struct auth_serversupplied_info;
-struct auth_session_info;
-
-struct spnego_data;
-struct gensec_ntlmssp_state;
-
 struct asn1_data;
-
-struct ldapsrv_call;
-struct ldapsrv_connection;
-struct ldap_connection;
-
-struct rap_NetShareEnum;
-struct rap_NetServerEnum2;
-
 struct smbsrv_tcon;
 struct smbsrv_connection;
-
-struct smbsrv_request;
-
-struct ntvfs_module_context;
-
-struct dcesrv_context;
-struct dcesrv_call_state;
-
-struct libnet_context;
-struct libnet_JoinDomain;
-
-struct clilist_file_info;
-
-struct netr_LMSessionKey;
-
-struct ldb_dn;
-struct ldb_message;
-struct ldb_context;
-struct ldb_parse_tree;
-
-struct lsa_RightSet;
-
-struct irpc_request;
-
-struct smb_composite_loadfile;
-struct smb_composite_savefile;
-struct smb_composite_connect;
-struct smb_composite_sesssetup;
-struct smb_composite_fetchfile;
-struct smb_composite_appendacl;
-struct smb_composite_fsinfo;
-
-struct nbt_dgram_socket;
-struct dgram_mailslot_handler;
-
-struct messaging_context;
-struct stream_connection;
-struct task_server;
-struct stream_server_ops;
-
-struct nbt_dc_name;
-struct wb_sid_object;
-
-struct cldap_socket;
-struct cldapd_server;
-
-struct websrv_context;
-
-struct wbsrv_call;
-
-struct ldb_map_attribute;
-struct ldb_map_objectclass;
-
 struct param_context;
-
-struct socket_address;
-struct smbcli_request;
 struct smbcli_tree;
-
 struct smb2_tree;
-
-struct IUnknown;
-struct IUnknown_vtable;
-
-struct MprVar;
-
-struct registry_context;
-struct nbtd_interface;
-struct smbcli_session;
-struct smbcli_state;
-
-struct model_ops;
-
-struct smb_wire_string;
-
-union smb_fileinfo;
+struct socket_address;