Module: vkd3d Branch: master Commit: ce9ec9a44a62eee4ddc8c3551e4fd41cf80f37f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce9ec9a44a62eee4ddc8c355...
Author: Józef Kucia jkucia@codeweavers.com Date: Fri Apr 13 12:37:44 2018 +0200
build: Remove rpc.h and rpcndr.h includes from generated headers.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
Makefile.am | 3 +-- include/dummy/rpc.h | 30 ------------------------------ include/dummy/rpcndr.h | 25 ------------------------- include/vkd3d_windows.h | 1 + 4 files changed, 2 insertions(+), 57 deletions(-)
diff --git a/Makefile.am b/Makefile.am index 8f0fc5f..aa2e2f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,8 +14,6 @@ widl_headers = \ include/vkd3d_dxgitype.h
vkd3d_public_headers = \ - include/dummy/rpc.h \ - include/dummy/rpcndr.h \ include/vkd3d.h \ include/vkd3d_d3d12.h \ include/vkd3d_d3dcommon.h \ @@ -149,6 +147,7 @@ EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -o $@ $< + sed -e '/#include <(rpc.h|rpcndr.h)>/d' -i $@ else echo "widl is required to generate $<" endif diff --git a/include/dummy/rpc.h b/include/dummy/rpc.h deleted file mode 100644 index 259a37a..0000000 --- a/include/dummy/rpc.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2016 Józef Kucia for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* XXX: This is a dummy header required by files generated by widl. */ -#ifndef __VKD3D_RPC_H__ -#define __VKD3D_RPC_H__ - -#define __RPC_STUB - -typedef struct IRpcStubBuffer IRpcStubBuffer; -typedef struct IRpcChannelBuffer IRpcChannelBuffer; - -typedef struct PRPC_MESSAGE PRPC_MESSAGE; - -#endif /* __VKD3D_RPC_H__ */ diff --git a/include/dummy/rpcndr.h b/include/dummy/rpcndr.h deleted file mode 100644 index 8d9b82c..0000000 --- a/include/dummy/rpcndr.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2016 Józef Kucia for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* XXX: This is a dummy header required by files generated by widl. */ -#ifndef __VKD3D_RPCNDR_H -#define __VKD3D_RPCNDR_H - -#define MIDL_INTERFACE(x) struct - -#endif /* __VKD3D_RPCNDR_H */ diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 425d139..9cea6b4 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -182,6 +182,7 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # define interface struct # define BEGIN_INTERFACE # define END_INTERFACE +# define MIDL_INTERFACE(x) struct
# ifdef __cplusplus # define EXTERN_C extern "C"