cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correct merge

Browse Source
This commit is contained in:
Dima Pasechnik 2018-02-08 12:50:08 +00:00
parent 1cbe5a4e5b
commit d7b4f7d023
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gmp-h.in
View File

@ -28,20 +28,11 @@ along with the GNU MP Library. If not, see http://www.gnu.org/licenses/. */
#include <stdarg.h> /* on Sun Studio */
#endif
<<<<<<< HEAD
#if defined(__has_include) /* should work on gcc 5.x or better, clang, VS 2015+ */
=======
#if defined(sun) || defined(__sun)
#if defined(__has_include) /* should work on gcc 5.x or better, or on clang */
>>>>>>> 67e6c2fb68ce0419d7974de384ccc70def6ac8ba
# if __has_include(<stdint.h>)
# include <stdint.h>
# endif
#endif
<<<<<<< HEAD
=======
#endif
>>>>>>> 67e6c2fb68ce0419d7974de384ccc70def6ac8ba
#if defined (__cplusplus)