From b2a967eea554fce9fdec21f5e19c9608406f530c Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Date: Thu, 28 Apr 2011 14:44:56 +0200
Subject: Make headers work with C++

Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
---
 include/grail-bits.h |  8 ++++++++
 include/grail.h      | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/include/grail-bits.h b/include/grail-bits.h
index 5d940eb..c151c11 100644
--- a/include/grail-bits.h
+++ b/include/grail-bits.h
@@ -23,6 +23,10 @@
 #ifndef _GRAIL_BITS_H
 #define _GRAIL_BITS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef unsigned char grail_mask_t;
 
 static inline void grail_mask_set(grail_mask_t *mask, int i)
@@ -60,4 +64,8 @@ int grail_mask_get_next(int i, const grail_mask_t *mask, int bytes);
 	     i >= 0;							\
 	     i = grail_mask_get_next(i, mask, bytes))
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/include/grail.h b/include/grail.h
index e2356da..d61197d 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -23,9 +23,13 @@
 #ifndef _GRAIL_H
 #define _GRAIL_H
 
+#include <linux/input.h>
 #include <grail-bits.h>
 #include <grail-types.h>
-#include <linux/input.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #define DIM_GRAIL_TYPE		64
 #define DIM_GRAIL_TYPE_BYTES	((DIM_GRAIL_TYPE + 7) >> 3)
@@ -266,4 +270,8 @@ void grail_get_units(const struct grail *ge,
 int grail_get_contacts(const struct grail *ge,
 		       struct grail_contact *touch, int max_touch);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
-- 
cgit v1.2.3