From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 94537 invoked by alias); 3 May 2017 16:04:05 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 94505 invoked by uid 89); 3 May 2017 16:04:03 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=2114 X-Spam-Status: No, score=-25.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR03-DB5-obe.outbound.protection.outlook.com Received: from mail-eopbgr40133.outbound.protection.outlook.com (HELO EUR03-DB5-obe.outbound.protection.outlook.com) (40.107.4.133) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 03 May 2017 16:04:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=K0Wf9C9f9sFYPpmzy6Qf6phLGdQaXGgZsOXuibgpCmI=; b=jZGkzqgZl81MHI+z+qZ8MppLYwK/iBYcZl8ypk6LDN32hyeyuyxAugK9W2fnvMvaX9NeSWikx+CDKnjlkz6/itfiWqT4IiAXgflFT1EdJNx/7bBrmhMrMURcSn3gEUVow7fPb+fPYM2g0B7xNZH7upDoem3SwmwcRMtz81V3fR4= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; Received: from [10.9.78.56] (62.220.2.194) by DB3PR02MB234.eurprd02.prod.outlook.com (2a01:111:e400:9410::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 3 May 2017 16:04:00 +0000 From: Ulf Hermann Subject: [PATCH] Drop __BEGIN_DECLS and __END_DECLS from elf.h To: Message-ID: <253cf7c9-2244-2b79-ba80-e90a6214e57d@qt.io> Date: Wed, 03 May 2017 16:52:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: VI1P190CA0032.EURP190.PROD.OUTLOOK.COM (2603:10a6:802:2b::45) To DB3PR02MB234.eurprd02.prod.outlook.com (2a01:111:e400:9410::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd547c9d-4601-4625-eb6a-08d4923e0373 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:DB3PR02MB234; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;3:BrfGvVHqBWYC/1kg/2DWzUw96UxLNPcN4Z/Kd6d2P9rhRtZY0DqWEwznSRFfdeTaTLMtBxPEJX//eP3B88qyOf8qclYgzXwTkakHuTk3wzeMu9o0Mk93NxfaCFDbaF4rqHZclX1JAFrgcCu5INA81jDsFVlwrlF6d38S+eXYudo08ol78gqoAkYhfNh/xHyeb9ZYejdzc/tfpLx2HK3o87WcjjMKKa6G2EE3ojOGGL7hLM1hxoTZXl+kZ9nWxP2M6qslEnfQAI8Y8HevYkhXO8qP9nqErbnQYexikQmaBhWviEf6xXqgkckNjGc30eln02pvFBr9RUrLFY3lFuUT1w==;25:T459PaufiIoEnvLjikOhtl8FcxvpwbLGykIMBMHQshRxix9IIspfOVLBN2pFdor+UqiZpy8AVydLXLzVtFE7EuBJjFKvpPZNxNSHtGcOLuoIY1qjEajLKZhh5LDL+4JqBp7/b4otX9iMomMXlzxY+VDYCEsATY0urvqvN+KHKxm5vGeOVLpZ//AZ/afQCd6CtQdhO6iLAM6dwvlM3P8ePRNHUVXxyBy9AyvXzrnjWFCXcrEMjrQh1uDG1+B9nwM318o/2mk/8Ri+WVDUJq49reu6146jkiexBkiFnAiqT3qy+dPts/rp+rWKvqklhWXHQkXyViYCadP8hhwTNoLA+zGChB51rXE15OjU5J4I11upP6EqWUG1EZx/Vj4by+p3KDSybyR7qMBTX2ks1W4HMCaW7E8Bo2bi+vcfAQQOfU106T9ULDWKsizml1ZnELdgCTLa7qjII2rayfoEKZwNCgpEoHkfcZoJEJ0t1Jy5HAM= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;31:N0+6c6nlMwqkAcEAllAm4u4Q6/6UC9n8jXyQHW/iTTGKuv0C2yIYnYXAdPqFnDI0aL0mqANw/5Q07Ms6xm1c2AuamwCcZlqQ91C31d/gb4g2iJPYC6FgWZjNGrdz7pvdVKmTVZaIoBmGIY4uGbma3QbYShNos2zSrI/Ize9Xf4GW5qQt0ODkSKhpaCZn5RZsffwXGN9nK2ch+40Q1cq/DAKHuLvCZbpfhiiNICi8sVGV0+wcwh3DvFNnbC42YA5hKLJ+FmXZx32ozkMTcRx/QQ==;20:Gtv8s9PxiXST7DrQA8E3HwYE/0K/lvUVs0WCTEVVc+Tty2fbzwm1c50/SUtWBVTDs7wENaG1xvH/+4P7GXIitQOx6Mimysq66TrnkO8R4/uJlAR0OuUL1jNkBqJp0tlz+x8G5Ed1BkRsjkILW1xTCXiP6JENZpqPP4ead6qR2FvJOLmpLfXalUSgSYqKeVbhvfao/6tH/C4P/iqtWQnO5jJUAXIQbIzNwvcNDMP4aQVl0Bw/A9Lby8NnpBQAql04 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123564025)(20161123555025)(20161123562025)(6072148);SRVR:DB3PR02MB234;BCL:0;PCL:0;RULEID:;SRVR:DB3PR02MB234; X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;4:SK9X6BYBRs58FHgRlxHx9YtiwIEXEP4vl3Eqqd6fs5OGoDzyy+z07Fu8wYWmKtBVEsZjptW6vp6aGRZHYUVuh1au4j22tIg+ZgTl/CZHLujCp+r0JMHwLvlWs/B6hBRY1V72iivzuggPdBohs/8z4fbXcKw2Xc5MlcPEsSLmd7q/P2RUjkN8hcpfsbDa4i3swdk2CqM0+LgJRoZjH3paji5GrNsUzL8QCXp46NIRecaViRuuhgf2xLyLoCAsIBMu9+lhx2kVwqY0jMvPlmOJffPiIktgnOq7Xd2JKPLN/vBiY1tgJ+Wv+EJHza3Bub6YpJjWtSVZ8zonNt/quO5G5HhSCdU87HcUCoMk8E8I8/TzjASOEfo6qOeIXK1xcyrrVkvZwmLxxKdX/emDTSEdSThIjL6mLW9hIZ80BLXX5OWXC6KcBSRQn4Wdd9Zbygk/a/Dr5Vzg87yc8ZCOUuwMbAADeUODSgD2NukW+y7qteg5O/v4fqZxePbMytuXEBIsrlOCWE7b35bci8P40TTBU9+1YjOA3GwVYdNfBfZNDELIMS0colPeiyh/dzEvYSArgGbkjo47bkcf2p+bM0fp31EwD4173DTRQ1V1/5MMdK059ekf4xlC+1AZLJMKUrPNgIkQ0v725965AK8rmvDphP9AB/KpThpbKJ68KfcWYwumRd6KH+F6bdR5veTb51yXHp6fXyhUT99PbJK/PM4EfEDhCEgzLa18tiWp+4rLQosPq3u2X1QhGi61HfE1J7WXh/wTDmJK9wa1st89O/MNEprGwLLxZT29Zve8JDPlHe1ybCHqsl3VjmOMR9EeX0OiSDWqNABtbCs/Tq//qMshCA== X-Forefront-PRVS: 029651C7A1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6049001)(39450400003)(39840400002)(39400400002)(39410400002)(54534003)(377424004)(305945005)(8676002)(81166006)(64126003)(54356999)(36756003)(50986999)(7736002)(478600001)(189998001)(2351001)(2906002)(33646002)(74482002)(31686004)(53936002)(42186005)(6486002)(77096006)(47776003)(5660300001)(23676002)(6666003)(6916009)(31696002)(83506001)(25786009)(3846002)(6116002)(86362001)(4001350100001)(230700001)(110136004)(38730400002)(50466002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB3PR02MB234;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjNQUjAyTUIyMzQ7MjM6d2xCNlE4Ky91RVphUHkwZkpCWmJGcnVPckx6?= =?utf-8?B?c3VnUHYvVERYeFd6R1pGRDBLYVBSOVZQaExNVVo5eW4xdXlWQTBocjg2elE1?= =?utf-8?B?VXdsSjNvenhrdy81b0RYeXQ2SGpySnNMT003SnlMd0xFQXpuVTdTSG8rNWFq?= =?utf-8?B?dFJoWDlaZnVxVUtTaGcxZlBFZFFXRytlem5lYkUzN2FESEc1QlJQdjhCaVll?= =?utf-8?B?Y21KcDlsTTdaUFVZZzBLeXRINXl1RlFmZmhiSTdFTnNWZW5LWGY0ejhTVWda?= =?utf-8?B?UkxzTXRKaXNRdXBNb2N5TXluZE05T2xuVzk0aVArcXZDckFYVTYzWjNtK09X?= =?utf-8?B?SmV2bkhUVE1YMTdRN1RoL0Y0MmM2YmUyM3VHWEdMWDNMVlUyTFB1NGlIc255?= =?utf-8?B?NXp1MGRwdVhqbDlML2tuVFpwYUo3dnBmWjNXR2ZkZ2dMWU9iQ0grNzBPekE1?= =?utf-8?B?ejlZYmdhNzI2TU81SDF2UlRDd1I1bzhTZHZMZHdsZHF2UytBOTBWM0U1MHhr?= =?utf-8?B?RHB2NHZYRjQ4NitEUUlxNkdCWnJkcHlNVnJNQ1VWWWlmRnM0ZXI2NHF3eUlI?= =?utf-8?B?dkFjWHIyZWJRM1EreTNkSWdCWkVPK2dRTUlYbUZWMWhkRmlMTklCQTJheUEw?= =?utf-8?B?Ym90TENWL3Fob2d6TUhNQVgrT2FvVGpzRWxQd2IrN2Rkd25FdElkdXNoUkhB?= =?utf-8?B?V0k4cmM4UkxydU51amx3Ky9WR3lXUTE4ZWg2clBnc3ZJaHFpS2hKREtqQWxr?= =?utf-8?B?Q0lmT29zSis2SVM5RlBXcHNkeEllTVVHZGtMbXUzVWN5R01WNzhrb1FvMm1F?= =?utf-8?B?UmtBTDdZblhyeFNublZTWTk2RzloUHZpTE1vQ1greThxS1hxMkRYUjcrcHNq?= =?utf-8?B?dzJhOUhQTTJrUEVCZGMyQU4yZ2ZrZ2NtcVFLMzRJQ0Nmem1SRHJvWXlXQk5X?= =?utf-8?B?RzVpdnFnbVl5UDZsMGp0Q3lFdm11UEZXeGxxZEJwelc3SlYrS2RMKzc4Lzlt?= =?utf-8?B?cjFNdnJDTmxPTEhBZ1o0MEQ4QTFtVmcrTlo4c01VUW9YcEVOb1NhckVPOTBM?= =?utf-8?B?VjZ5TWwxeGlGUnJyekR6RWVMeGY4R2ZHMk4ybUJacEZ0VjF2RFVLemYreitN?= =?utf-8?B?K2N2TTZIT0lNRGQ1MklrRG9ZYk1BK3dHMkYyM013cTlDdVArdXVNUEVFT3Rk?= =?utf-8?B?aGYyaFhYTFRlanAwSVMrVXVhd3dsMTZRaDNxa29heFlUTDB0enFva1pUV0xC?= =?utf-8?B?SFUvSU5GWUxpZVkwU1BJQ294Nkh4MmpVS0xnRnpSL3oxblRTbG9vV0tKOVkv?= =?utf-8?B?SmdyZUpkLy9xcUhnSm5UbWI1Z3IwL054UWluek5YL2x3dTE4amZOR0g4Q3dK?= =?utf-8?B?WnQwOFM2N3d1NFZvTXo2V1JxUEhyZW5ycVBWaCtvWlROV2FQU0l0aWxjZDhy?= =?utf-8?B?eEsrSEY2aDAwQ1hwNVFDcU4vRTBzb2c0WUU4Q3p1d1FCN2pkcmh4VStpaXha?= =?utf-8?Q?SAi6APWsncG/5pUXMDhuGwDo=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;6:JtKwzXM+8K+XDGgyF6RzgxDFpzNkMi91wqO4N4bcfBrhZrclhDP0oBui1GLoOnyaj+MGacHoDOTzjI2NB2hvQz6PYd29Hgi2ynsFXZ+WpQ93wTKsOAzyZ+uvHakZqQZ98eecrnJAKcSC1IQAENZTl8C829K2ynziK+s9EoJSbIRktu1guMBBuszLTcuFoQIlm4c7Wwj51UM7+X7PcysKzcRHpkoF78w5sB8nw5Y9g59SV0dx0k0qF+rfBWrOg2h7SGFSq3wvhO0AKtO/UdwXOatlXC+DJn9/ohe8OnO0wqrbgRCb8P6mC2QE7MP8/BG3L6eh/3D1iYgbhup9XLcisnk7MF2DXM3DTquSNc76qFGuu9BNZJraDKi+/f6Sucaf5NPgSzT1FoaYEeBdJrLSfJIlXVaz7xLMWj51TDPav1rskfuKgDaTm4aAt+6ZGunuo22yqNy5Q8Ywc76fsNU/MdYcmDG9Y0t33P/ow4PBcCA/v5UVDu8TP0X5elbzxCpTmTfjRwjiMXftdjr4rbHTwQ==;5:3QwGzRDqba+o5Ypj63T5PjIkaHX+Eec2S/Xihn1v155hRLmjEWIALFxsPPc7J6vMCT6vGbQxPKkihQDa8VSD/tNOo1+gAp2cEZiRH6PoFKmmHtVfmGdA0EhYdqxx4YjAMFdg1tVspY8994oYX0qHVnQfLvJdDLTXRo/YetpBAjM=;24:BZpj5WNOZhtd/c1m4shd22V57zqzYy3PiMGgMs9HHJPtBYO102Dx6bS29ctCQAJGi4uxqt6ghWL2153oTLP4wB2Mn/re747jQN3YEE4bHhU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB3PR02MB234;7:CpyujK8IDUrLY6CzNIC6m7ym+GSQfRgv3t/+VWKp7al0mqoKxWNxa/tfVZ09g1gJeKhVMff6h+KsLdXLWSVgiO6syJ2PxdJXSJfu9bBwOKwScVDJ7pIbT8uiLcYXkN6TNNoCl/TixTUkow6Qxw++hUJTuR/SVqg35YDoRkhF/WZzr3rs47L0UILXFx/Tr71JtZLT3fEIlAM9LMyJqKGHeM66UkiTpLxaNMufMaq0P5Ea4xm5OTRdLB3ulbJHg28+nbOScTW413KBcIhgvSSAZwrjqo5cLOp/+CjZeZ2n/TpElL9SPYdRj9k/dwuBaRb3ki1GcFtw53lHlYfOXI5rOw== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 May 2017 16:04:00.7763 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR02MB234 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00147.txt.bz2 We don't use those anywhere else and they are not guaranteed to be defined. Also, put the 'extern "C"' after the included headers. Signed-off-by: Ulf Hermann --- libelf/ChangeLog | 4 ++++ libelf/elf.h | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libelf/ChangeLog b/libelf/ChangeLog index e947e19..40a2876 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2017-05-03 Ulf Hermann + + * elf.h: Replace __BEGIN_DECLS and __END_DECLS with extern "C". + 2017-02-28 Ulf Hermann * Makefile.am: Use the predefined common library names rather than diff --git a/libelf/elf.h b/libelf/elf.h index b6112d9..ba385d3 100644 --- a/libelf/elf.h +++ b/libelf/elf.h @@ -21,12 +21,14 @@ #include -__BEGIN_DECLS - /* Standard ELF types. */ #include +#ifdef __cplusplus +extern "C" { +#endif + /* Type for a 16-bit quantity. */ typedef uint16_t Elf32_Half; typedef uint16_t Elf64_Half; @@ -3682,6 +3684,8 @@ enum #define R_BPF_NONE 0 /* No reloc */ #define R_BPF_MAP_FD 1 /* Map fd to pointer */ -__END_DECLS +#ifdef __cplusplus +} +#endif #endif /* elf.h */ -- 2.1.4