Attachment 145054 Details for Bug 192177 – patch to src/Mumble.bp-c.h to allow build with protobuf-c 1.0.0

[patch] patch to src/Mumble.bp-c.h to allow build with protobuf-c 1.0.0

patch-src_Mumble.bp-c.h (text/plain), 2.71 KB, created by Don Lewis on 2014-07-27 23:32:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2014-07-27 23:32:39 UTC

Size: 2.71 KB

patch

obsolete

>--- src/Mumble.pb-c.h.orig	2013-06-09 11:56:17.000000000 -0700
>+++ src/Mumble.pb-c.h	2014-07-27 15:20:59.000000000 -0700
>@@ -1,11 +1,18 @@
> /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
>+/* Generated from: Mumble.proto */
> 
> #ifndef PROTOBUF_C_Mumble_2eproto__INCLUDED
> #define PROTOBUF_C_Mumble_2eproto__INCLUDED
> 
>-#include <google/protobuf-c/protobuf-c.h>
>+#include <protobuf-c/protobuf-c.h>
> 
>-PROTOBUF_C_BEGIN_DECLS
>+PROTOBUF_C__BEGIN_DECLS
>+
>+#if PROTOBUF_C_VERSION_NUMBER < 1000000
>+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
>+#elif 1000000 < PROTOBUF_C_MIN_COMPILER_VERSION
>+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
>+#endif
> 
> 
> typedef struct _MumbleProto__Version MumbleProto__Version;
>@@ -53,6 +60,7 @@
>   MUMBLE_PROTO__REJECT__REJECT_TYPE__UsernameInUse = 5,
>   MUMBLE_PROTO__REJECT__REJECT_TYPE__ServerFull = 6,
>   MUMBLE_PROTO__REJECT__REJECT_TYPE__NoCertificate = 7
>+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MUMBLE_PROTO__REJECT__REJECT_TYPE)
> } MumbleProto__Reject__RejectType;
> typedef enum _MumbleProto__PermissionDenied__DenyType {
>   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__Text = 0,
>@@ -66,15 +74,18 @@
>   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__UserName = 8,
>   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__ChannelFull = 9,
>   MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE__NestingLimit = 10
>+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MUMBLE_PROTO__PERMISSION_DENIED__DENY_TYPE)
> } MumbleProto__PermissionDenied__DenyType;
> typedef enum _MumbleProto__ContextActionModify__Context {
>   MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__Server = 1,
>   MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__Channel = 2,
>   MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT__User = 4
>+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__CONTEXT)
> } MumbleProto__ContextActionModify__Context;
> typedef enum _MumbleProto__ContextActionModify__Operation {
>   MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION__Add = 0,
>   MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION__Remove = 1
>+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MUMBLE_PROTO__CONTEXT_ACTION_MODIFY__OPERATION)
> } MumbleProto__ContextActionModify__Operation;
> 
> /* --- messages --- */
>@@ -1304,7 +1315,7 @@
> extern const ProtobufCMessageDescriptor mumble_proto__suggest_config__descriptor;
> extern const ProtobufCMessageDescriptor mumble_proto__request_blob__descriptor;
> 
>-PROTOBUF_C_END_DECLS
>+PROTOBUF_C__END_DECLS
> 
> 
>-#endif  /* PROTOBUF_Mumble_2eproto__INCLUDED */
>+#endif  /* PROTOBUF_C_Mumble_2eproto__INCLUDED */

Actions: View | Diff

Attachments on bug 192177: 145052 | 145053 | 145054 | 145061 | 145063 | 145804