Revision: 65375
http://sourceforge.net/p/brlcad/code/65375
Author: starseeker
Date: 2015-06-18 00:39:30 +0000 (Thu, 18 Jun 2015)
Log Message:
-----------
redefine is only for C
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2015-06-18 00:17:09 UTC (rev 65374)
+++ brlcad/trunk/CMakeLists.txt 2015-06-18 00:39:30 UTC (rev 65375)
@@ -1682,7 +1682,9 @@
# misc/CMake/BRLCAD_Targets.cmake for handling of C_INLINE.
CHECK_C_INLINE(C_INLINE)
if(NOT HAVE_INLINE_KEYWORD AND HAVE___INLINE_KEYWORD)
- CONFIG_H_APPEND(BRLCAD "#define inline __inline\n")
+ CONFIG_H_APPEND(BRLCAD "#ifndef __cplusplus\n")
+ CONFIG_H_APPEND(BRLCAD "# define inline __inline\n")
+ CONFIG_H_APPEND(BRLCAD "#endif /* not __cplusplus */\n")
endif(NOT HAVE_INLINE_KEYWORD AND HAVE___INLINE_KEYWORD)
# If doing an optimized build, set _FORTIFY_SOURCE to 2. Provides
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
