From: Matt Benjamin <matt@linuxbox.com>
Date: Mon, 23 Jun 2014 23:35:57 +0000 (-0400)
Subject: Don't use __cplusplus to mean !__KERNEL__
X-Git-Tag: v0.93~265^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f57383ae7493c7bac7f048a6ed3efe96c3465fc4;p=ceph.git

Don't use __cplusplus to mean !__KERNEL__

Of course, this is Linux-centric.

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
---

diff --git a/src/include/msgr.h b/src/include/msgr.h
index a1ad993ac8be..ac98344a2cdd 100644
--- a/src/include/msgr.h
+++ b/src/include/msgr.h
@@ -1,7 +1,7 @@
 #ifndef CEPH_MSGR_H
 #define CEPH_MSGR_H
 
-#ifdef __cplusplus
+#ifndef __KERNEL__
 #include <sys/socket.h> // for struct sockaddr_storage
 #endif