xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] fix build error w/o MEMSHR
@ 2012-04-13 14:25 Christoph Egger
  2012-04-24 17:16 ` Ian Jackson
  0 siblings, 1 reply; 3+ messages in thread
From: Christoph Egger @ 2012-04-13 14:25 UTC (permalink / raw)
  To: xen-devel@lists.xen.org

[-- Attachment #1: Type: text/plain, Size: 154 bytes --]


Do not include memshr.h when MEMSHR is not defined.
Fixes build error when MEMSHR is disabled.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

[-- Attachment #2: xen_tools_blktapctrl.diff --]
[-- Type: text/plain, Size: 438 bytes --]

diff -r ab552da976a3 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c	Wed Apr 11 18:28:33 2012 +0200
+++ b/tools/blktap/drivers/blktapctrl.c	Fri Apr 13 16:21:11 2012 +0200
@@ -50,7 +50,9 @@
 #include <xs.h>
 #include <sys/time.h>
 #include <syslog.h>
+#ifdef MEMSHR
 #include <memshr.h>
+#endif
 #include <sys/stat.h>
                                                                      
 #include "blktaplib.h"

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] fix build error w/o MEMSHR
  2012-04-13 14:25 [PATCH] fix build error w/o MEMSHR Christoph Egger
@ 2012-04-24 17:16 ` Ian Jackson
  2012-04-25  9:09   ` Christoph Egger
  0 siblings, 1 reply; 3+ messages in thread
From: Ian Jackson @ 2012-04-24 17:16 UTC (permalink / raw)
  To: Christoph Egger; +Cc: xen-devel@lists.xen.org

Christoph Egger writes ("[Xen-devel] [PATCH] fix build error w/o MEMSHR"):
> 
> Do not include memshr.h when MEMSHR is not defined.
> Fixes build error when MEMSHR is disabled.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] fix build error w/o MEMSHR
  2012-04-24 17:16 ` Ian Jackson
@ 2012-04-25  9:09   ` Christoph Egger
  0 siblings, 0 replies; 3+ messages in thread
From: Christoph Egger @ 2012-04-25  9:09 UTC (permalink / raw)
  To: Ian Jackson; +Cc: xen-devel@lists.xen.org

On 04/24/12 19:16, Ian Jackson wrote:

> Christoph Egger writes ("[Xen-devel] [PATCH] fix build error w/o MEMSHR"):
>>
>> Do not include memshr.h when MEMSHR is not defined.
>> Fixes build error when MEMSHR is disabled.
> 
> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>


Thanks.

Christoph

-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-04-25  9:09 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-13 14:25 [PATCH] fix build error w/o MEMSHR Christoph Egger
2012-04-24 17:16 ` Ian Jackson
2012-04-25  9:09   ` Christoph Egger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).