From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3613-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 18315 invoked by alias); 26 Oct 2010 09:57:05 -0000
Received: (qmail 18297 invoked by uid 9737); 26 Oct 2010 09:57:04 -0000
Date: Tue, 26 Oct 2010 09:57:00 -0000
Message-ID: <20101026095704.18295.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/daemons/clvmd clvmd.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2010-10/txt/msg00096.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-10-26 09:57:03

Modified files:
	daemons/clvmd  : clvmd.c 

Log message:
	Hotfix usage of __builtin_unreachable()
	
	It's quite new feature which is not supported by older compilers.
	So until some better macros are introduced into LVM code - hotfix current
	compilation problems and compile this code only for __clang__ defining compilers.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/daemons/clvmd/clvmd.c.diff?cvsroot=lvm2&r1=1.79&r2=1.80

--- LVM2/daemons/clvmd/clvmd.c	2010/10/26 09:01:47	1.79
+++ LVM2/daemons/clvmd/clvmd.c	2010/10/26 09:57:03	1.80
@@ -491,7 +491,9 @@
 		DEBUGLOG("Can't initialise cluster interface\n");
 		log_error("Can't initialise cluster interface\n");
 		child_init_signal(DFAIL_CLUSTER_IF);
+#ifdef __clang__
 		__builtin_unreachable();
+#endif
 	}
 	DEBUGLOG("Cluster ready, doing some more initialisation\n");
 
@@ -508,7 +510,9 @@
 	newfd = malloc(sizeof(struct local_client));
 	if (!newfd) {
 		child_init_signal(DFAIL_MALLOC);
+#ifdef __clang__
 		__builtin_unreachable();
+#endif
 	}
 
 	newfd->fd = local_sock;