[PATCH 1/3] remove usage of 'c_plusplus' preprocessor macro

Tapani Pälli tapani.palli at intel.com
Fri Aug 7 00:37:56 PDT 2015


Use only __cplusplus which is supported by the C++ standard.

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 libkms/libkms.h | 4 ++--
 xf86drm.h       | 4 ++--
 xf86drmMode.h   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libkms/libkms.h b/libkms/libkms.h
index c00b159..930a2bf 100644
--- a/libkms/libkms.h
+++ b/libkms/libkms.h
@@ -29,7 +29,7 @@
 #ifndef _LIBKMS_H_
 #define _LIBKMS_H_
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -75,7 +75,7 @@ int kms_bo_map(struct kms_bo *bo, void **out);
 int kms_bo_unmap(struct kms_bo *bo);
 int kms_bo_destroy(struct kms_bo **bo);
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(__cplusplus)
 };
 #endif
 
diff --git a/xf86drm.h b/xf86drm.h
index e3a19dc..360e04a 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -39,7 +39,7 @@
 #include <stdint.h>
 #include <drm.h>
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -759,7 +759,7 @@ extern int drmPrimeFDToHandle(int fd, int prime_fd, uint32_t *handle);
 extern char *drmGetPrimaryDeviceNameFromFd(int fd);
 extern char *drmGetRenderDeviceNameFromFd(int fd);
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(__cplusplus)
 }
 #endif
 
diff --git a/xf86drmMode.h b/xf86drmMode.h
index 1c10023..4de7bbb 100644
--- a/xf86drmMode.h
+++ b/xf86drmMode.h
@@ -36,7 +36,7 @@
 #ifndef _XF86DRMMODE_H_
 #define _XF86DRMMODE_H_
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(__cplusplus)
 extern "C" {
 #endif
 
@@ -508,7 +508,7 @@ extern int drmModeCreatePropertyBlob(int fd, const void *data, size_t size,
 extern int drmModeDestroyPropertyBlob(int fd, uint32_t id);
 
 
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(__cplusplus)
 }
 #endif
 
-- 
2.1.0



More information about the dri-devel mailing list