libcriu: don't include rpc.pb-c.h into criu.h, v2

Signed-off-by: Ruslan Kuprieiev <rkuprieiev@cloudlinux.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

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

lib/criu.h

@@ -20,7 +20,6 @@
 #define __CRIU_LIB_H__
 
 #include <stdbool.h>
-#include "rpc.pb-c.h"
 
 #ifdef __GNUG__
        extern "C" {
@@ -136,9 +135,9 @@ int criu_dump_iters(int (*more)(criu_predump_info pi));
  * Same as the list above, but lets you have your very own options
  * structure and lets you set individual options in it.
  */
-
+typedef struct _CriuOpts *criu_pb_opts_t;
 typedef struct {
-	CriuOpts		*rpc; /* Generic RPC options in protobuf format */
+	criu_pb_opts_t		rpc; /* Generic RPC options in protobuf format */
 	int			(*notify)(char *action, criu_notify_arg_t na);
 	enum criu_service_comm	service_comm;
 	union {