[CRIU] [PATCH] libcriu: don't include rpc.pb-c.h into criu.h

[Ruslan Kuprieiev]

Drop it please, will send a new one soon.

Thanks.

On 07/16/2015 09:59 PM, Ruslan Kuprieiev wrote:
> Signed-off-by: Ruslan Kuprieiev <rkuprieiev at cloudlinux.com>
> ---
>   Makefile   | 2 +-
>   lib/criu.c | 2 +-
>   lib/criu.h | 3 ++-
>   3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index d67ed0b..6ed4c90 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -161,7 +161,7 @@ SYSCALL-LIB	:= $(ARCH_DIR)/syscalls.built-in.o
>   ARCH-LIB	:= $(ARCH_DIR)/crtools.built-in.o
>   CRIU-SO		:= libcriu
>   CRIU-LIB	:= lib/$(CRIU-SO).so
> -CRIU-INC	:= lib/criu.h include/criu-plugin.h include/criu-log.h protobuf/rpc.proto protobuf/rpc.pb-c.h
> +CRIU-INC	:= lib/criu.h include/criu-plugin.h include/criu-log.h protobuf/rpc.proto
>   ifeq ($(piegen-y),y)
>   piegen		:= pie/piegen/piegen
>   endif
> diff --git a/lib/criu.c b/lib/criu.c
> index ffa161d..da6288a 100644
> --- a/lib/criu.c
> +++ b/lib/criu.c
> @@ -12,8 +12,8 @@
>   #include <signal.h>
>   #include <alloca.h>
>   
> -#include "criu.h"
>   #include "rpc.pb-c.h"
> +#include "criu.h"
>   #include "cr-service-const.h"
>   
>   const char *criu_lib_version = CRIU_VERSION;
> diff --git a/lib/criu.h b/lib/criu.h
> index 1655c02..81d3396 100644
> --- a/lib/criu.h
> +++ b/lib/criu.h
> @@ -20,7 +20,6 @@
>   #define __CRIU_LIB_H__
>   
>   #include <stdbool.h>
> -#include "rpc.pb-c.h"
>   
>   enum criu_service_comm {
>   	CRIU_COMM_SK,
> @@ -133,6 +132,8 @@ int criu_dump_iters(int (*more)(criu_predump_info pi));
>    * structure and lets you set individual options in it.
>    */
>   
> +typedef struct _CriuOpts CriuOpts;
> +
>   typedef struct {
>   	CriuOpts		*rpc; /* Generic RPC options in protobuf format */
>   	int			(*notify)(char *action, criu_notify_arg_t na);