diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-09 13:27:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-15 17:37:08 +0200 |
| commit | 701b856c523acab3ca01b7d41329198aac85a20b (patch) | |
| tree | d1c48f52e28cba8e3b4796d0259dd50e0f44a9fe | |
| parent | ea98ddb8a1eb848fd3ec65480e8ac79c622277b0 (diff) | |
| download | samba-701b856c523acab3ca01b7d41329198aac85a20b.tar.gz samba-701b856c523acab3ca01b7d41329198aac85a20b.tar.bz2 samba-701b856c523acab3ca01b7d41329198aac85a20b.zip | |
Fix COM headers.
| -rw-r--r-- | source4/lib/com/com.h | 43 | ||||
| -rw-r--r-- | source4/lib/com/config.mk | 2 |
2 files changed, 22 insertions, 23 deletions
diff --git a/source4/lib/com/com.h b/source4/lib/com/com.h index 75d088deb3..2a40dae3d7 100644 --- a/source4/lib/com/com.h +++ b/source4/lib/com/com.h @@ -1,32 +1,33 @@ -#ifndef __LIB_COM_PROTO_H__ -#define __LIB_COM_PROTO_H__ - -#undef _PRINTF_ATTRIBUTE -#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2) -/* This file was automatically generated by mkproto.pl. DO NOT EDIT */ - -/* this file contains prototypes for functions that are private - * to this subsystem or library. These functions should not be - * used outside this particular subsystem! */ - - -/* The following definitions come from lib/com/tables.c */ +/* + Unix SMB/CIFS implementation. + Utility functions for Samba + Copyright (C) Jelmer Vernooij 2008 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef __SAMBA_COM_H__ +#define __SAMBA_COM_H__ struct IUnknown *com_class_by_clsid(struct com_context *ctx, const struct GUID *clsid); NTSTATUS com_register_running_class(struct GUID *clsid, const char *progid, struct IUnknown *p); -/* The following definitions come from lib/com/rot.c */ - struct dcom_interface_p *dcom_get_local_iface_p(struct GUID *ipid); -/* The following definitions come from lib/com/main.c */ - WERROR com_init_ctx(struct com_context **ctx, struct event_context *event_ctx); WERROR com_create_object(struct com_context *ctx, struct GUID *clsid, int num_ifaces, struct GUID *iid, struct IUnknown **ip, WERROR *results); WERROR com_get_class_object(struct com_context *ctx, struct GUID *clsid, struct GUID *iid, struct IUnknown **ip); NTSTATUS com_init(void); -#undef _PRINTF_ATTRIBUTE -#define _PRINTF_ATTRIBUTE(a1, a2) - -#endif /* __LIB_COM_PROTO_H__ */ +#endif /* __SAMBA_COM_H__ */ diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index 24634db1ba..5c8e98dc46 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,10 +1,8 @@ [SUBSYSTEM::COM] -PRIVATE_PROTO_HEADER = proto.h COM_OBJ_FILES = $(addprefix lib/com/, tables.o rot.o main.o) [SUBSYSTEM::DCOM] -PRIVATE_PROTO_HEADER = dcom/proto.h PUBLIC_DEPENDENCIES = com DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER |