Attachment 869810 Details for Bug 1071782 – difference in src/lxc/lxc_monitor_protocol.h

[patch] difference in src/lxc/lxc_monitor_protocol.h

libvirt.diff (text/plain), 2.57 KB, created by redhat on 2014-03-03 07:38:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: redhat

Created: 2014-03-03 07:38:56 UTC

Size: 2.57 KB

patch

obsolete

>--- src/lxc/lxc_monitor_protocol.h	2014-02-23 20:53:02.000000000 -0600
>+++ src/lxc/lxc_monitor_protocol.h	2014-03-03 01:27:35.000000000 -0600
>@@ -6,57 +6,35 @@
> #ifndef _LXC_MONITOR_PROTOCOL_H_RPCGEN
> #define _LXC_MONITOR_PROTOCOL_H_RPCGEN
> 
>-#include <rpc/rpc.h>
>-
>+#define RPCGEN_VERSION	199506
> 
>-#ifdef __cplusplus
>-extern "C" {
>-#endif
>+#include <rpc/rpc.h>
> 
> 
> enum virLXCMonitorExitStatus {
>-        VIR_LXC_MONITOR_EXIT_STATUS_ERROR = 0,
>-        VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN = 1,
>-        VIR_LXC_MONITOR_EXIT_STATUS_REBOOT = 2,
>+	VIR_LXC_MONITOR_EXIT_STATUS_ERROR = 0,
>+	VIR_LXC_MONITOR_EXIT_STATUS_SHUTDOWN = 1,
>+	VIR_LXC_MONITOR_EXIT_STATUS_REBOOT = 2,
> };
> typedef enum virLXCMonitorExitStatus virLXCMonitorExitStatus;
>+#ifdef __cplusplus
>+extern "C" bool_t xdr_virLXCMonitorExitStatus(XDR *, virLXCMonitorExitStatus*);
>+#elif __STDC__
>+extern  bool_t xdr_virLXCMonitorExitStatus(XDR *, virLXCMonitorExitStatus*);
>+#else /* Old Style C */
>+bool_t xdr_virLXCMonitorExitStatus();
>+#endif /* Old Style C */
>+
> 
> struct virLXCMonitorExitEventMsg {
>-        enum virLXCMonitorExitStatus status;
>+	enum virLXCMonitorExitStatus status;
> };
> typedef struct virLXCMonitorExitEventMsg virLXCMonitorExitEventMsg;
>-
>-struct virLXCMonitorInitEventMsg {
>-        uint64_t initpid;
>-};
>-typedef struct virLXCMonitorInitEventMsg virLXCMonitorInitEventMsg;
>-#define VIR_LXC_MONITOR_PROGRAM 0x12341234
>-#define VIR_LXC_MONITOR_PROGRAM_VERSION 1
>-
>-enum virLXCMonitorProcedure {
>-        VIR_LXC_MONITOR_PROC_EXIT_EVENT = 1,
>-        VIR_LXC_MONITOR_PROC_INIT_EVENT = 2,
>-};
>-typedef enum virLXCMonitorProcedure virLXCMonitorProcedure;
>-
>-/* the xdr functions */
>-
>-#if defined(__STDC__) || defined(__cplusplus)
>-extern  bool_t xdr_virLXCMonitorExitStatus (XDR *, virLXCMonitorExitStatus*);
>-extern  bool_t xdr_virLXCMonitorExitEventMsg (XDR *, virLXCMonitorExitEventMsg*);
>-extern  bool_t xdr_virLXCMonitorInitEventMsg (XDR *, virLXCMonitorInitEventMsg*);
>-extern  bool_t xdr_virLXCMonitorProcedure (XDR *, virLXCMonitorProcedure*);
>-
>-#else /* K&R C */
>-extern bool_t xdr_virLXCMonitorExitStatus ();
>-extern bool_t xdr_virLXCMonitorExitEventMsg ();
>-extern bool_t xdr_virLXCMonitorInitEventMsg ();
>-extern bool_t xdr_virLXCMonitorProcedure ();
>-
>-#endif /* K&R C */
>-
> #ifdef __cplusplus
>-}
>-#endif
>+extern "C" bool_t xdr_virLXCMonitorExitEventMsg(XDR *, virLXCMonitorExitEventMsg*);
>+#elif __STDC__
>+extern  bool_t xdr_virLXCMonitorExitEventMsg(XDR *, virLXCMonitorExitEventMsg*);
>+#else /* Old Style C */
>+bool_t xdr_virLXCMonitorExitEventMsg();
>+#endif /* Old Style C */
> 
>-#endif /* !_LXC_MONITOR_PROTOCOL_H_RPCGEN */

Actions: View | Diff

Attachments on bug 1071782: 869810