From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Wed, 30 Mar 2016 06:52:38 +0000 (+0200)
Subject: build: workaround broken SASL header (again)
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ab74e8763d2e00b5e9fc4ac39e70dfa5de4d3cc4;p=libvirt.git

build: workaround broken SASL header (again)

Compilation for xdg-app failed due to a buggy SASL headers present on
the used runtime (org.gnome.Sdk 3.18).

In file included from rpc/virnetsaslcontext.h:24:0,
                 from rpc/virnetsaslcontext.c:25:
/usr/include/sasl/sasl.h:230:38: error: unknown type name 'size_t'
 typedef void *sasl_realloc_t(void *, size_t);
                                      ^
/usr/include/sasl/sasl.h:235:5: error: unknown type name 'sasl_realloc_t'
     sasl_realloc_t *,

Use the same workaround as commit 1be3dfd did.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/rpc/virnetsaslcontext.h b/src/rpc/virnetsaslcontext.h
index 54634d5f12..edc082f3a7 100644
--- a/src/rpc/virnetsaslcontext.h
+++ b/src/rpc/virnetsaslcontext.h
@@ -21,9 +21,9 @@
 #ifndef __VIR_NET_CLIENT_SASL_CONTEXT_H__
 # define __VIR_NET_CLIENT_SASL_CONTEXT_H__
 
+# include "internal.h"
 # include <sasl/sasl.h>
 
-# include "internal.h"
 # include "virobject.h"
 
 typedef struct _virNetSASLContext virNetSASLContext;