From owner-svn-src-projects@freebsd.org Tue Aug 23 19:57:38 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4E88ABC44DB for ; Tue, 23 Aug 2016 19:57:38 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1013B1B07; Tue, 23 Aug 2016 19:57:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7NJvb7h039192; Tue, 23 Aug 2016 19:57:37 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7NJvbnG039191; Tue, 23 Aug 2016 19:57:37 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201608231957.u7NJvbnG039191@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 23 Aug 2016 19:57:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304701 - projects/clang390-import/lib/clang/include/llvm/Support X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2016 19:57:38 -0000 Author: dim Date: Tue Aug 23 19:57:37 2016 New Revision: 304701 URL: https://svnweb.freebsd.org/changeset/base/304701 Log: Update generated llvm DataTypes.h header. Modified: projects/clang390-import/lib/clang/include/llvm/Support/DataTypes.h Modified: projects/clang390-import/lib/clang/include/llvm/Support/DataTypes.h ============================================================================== --- projects/clang390-import/lib/clang/include/llvm/Support/DataTypes.h Tue Aug 23 19:55:02 2016 (r304700) +++ projects/clang390-import/lib/clang/include/llvm/Support/DataTypes.h Tue Aug 23 19:57:37 2016 (r304701) @@ -22,8 +22,6 @@ /* Please leave this file C-compatible. */ -/* Please keep this file in sync with DataTypes.h.in */ - #ifndef SUPPORT_DATATYPES_H #define SUPPORT_DATATYPES_H @@ -38,36 +36,43 @@ #include #endif +#ifdef __cplusplus +#include +#else #ifdef HAVE_INTTYPES_H #include #endif +#endif +#ifdef __cplusplus +#include +#else #ifdef HAVE_STDINT_H #include #else #error "Compiler must provide an implementation of stdint.h" #endif +#endif #ifndef _MSC_VER -/* Note that this header's correct operation depends on __STDC_LIMIT_MACROS - being defined. We would define it here, but in order to prevent Bad Things - happening when system headers or C++ STL headers include stdint.h before we - define it here, we define it on the g++ command line (in Makefile.rules). */ -#if !defined(__STDC_LIMIT_MACROS) -# error "Must #define __STDC_LIMIT_MACROS before #including Support/DataTypes.h" +#if !defined(UINT32_MAX) +# error "The standard header is not C++11 compliant. Must #define "\ + "__STDC_LIMIT_MACROS before #including Support/DataTypes.h" #endif -#if !defined(__STDC_CONSTANT_MACROS) -# error "Must #define __STDC_CONSTANT_MACROS before " \ - "#including Support/DataTypes.h" +#if !defined(UINT32_C) +# error "The standard header is not C++11 compliant. Must #define "\ + "__STDC_CONSTANT_MACROS before #including Support/DataTypes.h" #endif /* Note that includes , if this is a C99 system. */ #include #ifdef _AIX -#include "llvm/Support/AIXDataTypesFix.h" +// GCC is strict about defining large constants: they must have LL modifier. +#undef INT64_MAX +#undef INT64_MIN #endif /* Handle incorrect definition of uint64_t as u_int64_t */ @@ -80,14 +85,14 @@ typedef u_int64_t uint64_t; #endif #else /* _MSC_VER */ -#include -#include -#include #ifdef __cplusplus -#include +#include +#include #else -#include +#include +#include #endif +#include #if defined(_WIN64) typedef signed __int64 ssize_t;