From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29095 invoked by alias); 4 May 2017 16:12:01 -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 29068 invoked by uid 89); 4 May 2017 16:12:00 -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.8 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= X-Spam-Status: No, score=-25.8 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: EUR01-HE1-obe.outbound.protection.outlook.com Received: from mail-he1eur01on0120.outbound.protection.outlook.com (HELO EUR01-HE1-obe.outbound.protection.outlook.com) (104.47.0.120) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 May 2017 16:11:58 +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=lhN9ToFbGW5Gib0eXruSVTGH9XZvwVL7mMTxNcG8m1Y=; b=JQNU5WUZREHfAzcj69FLqdnZVRVNKjVCena9vt/UZXH+1vqv/Oq01QeAmWBY7twNn1NMWR3LWzLmi7tOL/yP8ejn1d4Ug1rDxLGGOlU9b92yAu7RkGLguxQuqTZ84X+Fpv+SbjwzCqVj66qb0fUbKtXP76zgG3nIGmuQOfEVLWo= 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 AM3PR02MB227.eurprd02.prod.outlook.com (2a01:111:e400:8810::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1061.12; Thu, 4 May 2017 16:11:57 +0000 From: Ulf Hermann Subject: [PATCH] Define uid_t and gid_t in system-elf-libelf-test.c if necessary To: Message-ID: <6d5d05de-a747-2aa7-d23d-98f485cb4d80@qt.io> Date: Thu, 04 May 2017 16:56: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: DB5PR03CA0013.eurprd03.prod.outlook.com (2a01:111:e400:51b8::23) To AM3PR02MB227.eurprd02.prod.outlook.com (2a01:111:e400:8810::19) X-MS-Office365-Filtering-Correlation-Id: 69793fd0-7820-484d-2856-08d4930849b5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075);SRVR:AM3PR02MB227; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB227;3:56RWjUSmWNrxCJsD8yrUJZxJXxu2g185vh+RLSXaCCM+0QSpzOHlQ5IWaEnszk/2n61LC52j9PDx+osgcLEWegFxmr8JG6Cp6MHYIGT0kr/0OoDv3lIwA5wQ9o+8QGDWXOM+iN7IYKKmFPDNxw9QTNXppSsjACQhOe8qBhS+Is5RT7MD4c+Z/cDO6oqY3IAoBBOTaaCW7r2SeSogXQr+03DY89D7aMOe9DCLXtUPGbR06l6DJSpxM0XHsQxB7TjxGPaA0S1zEixzdN7jvp3pDMFBpZGYWH14GRbAstTsehpoouCLuuqGHLsLKbkh9GTP;25:cmrnuijacqXzwo+m8mDKBOOYvwSXtsLhfKlokTg8yItVnANgiL6MgDSu9c4wklBZfrM5hKua+yojmlKu2DPVRoRz16jjx43yAsdwPmHIbsD7eWDxy4HPcg95Whx0oa6v8X7PpQU5lXAbQz0WLbjDE+JZUL9isZx1Tb8A29pKwcmFPbeKaG613E1s3DxPvRxbya3uaVbK0fQrtv48CqrYv5dJNrKo0BF2DOg/Oq9KCgTbdLWMwqds+f9HpUU8tZ9jlS/UNFtFuDq6ckW2bQeaL34tJwykk+hlsgpL+ANjt0lHCnWZmVPm7hVKuYA8d3+1uulKr2eJ6ViOLCNeEb5HZJM5Ygto9MMA4AQiz8ev+KZu5mqW9+XwuFJsOMoHGRvEE/j+1gaP2cCC/kgub46uv8hjily7cjTK0YGY5FCQKISsv7fsWHclQuuwet2w51Cqb3AgWL1RQ8Za3twdyDRgQw== X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB227;31:fXS+aJgrt7YOsMwQ1T2+Mu37Y1fqvZazu7p8uPbzPCHQSKmcDldHDEMUun9gctD9kGvVWKJHOfittgJncpjYDD7Q0oh/PU/47EftKl4Gjte7cSCdG9vp4X2Ph4xiLlqmW+W91xxaGSXVbhUeZfYN7k2bfJm4ZSyWC4/H9LLH2dG95cGPrD5SJHrzd7Do5/Icg03gAXUI09U7Hpa76//vpnF8ul6+BrSH/a/YQqHt5x1eCWN/xhzv1C1SX1DWYRFesr/7xlFLQFSL/nqXp9dBHg==;20:dg6ViSpAQwoVeDiTvB3LHxO73AMfSOu5vzfXjNI2YCCOYoyidOV1G5gwHB4ICvr02aj1LBGRSsqndc/oGdhBSNn+4NkWl25dBjfEEl+K0gUYz5WZGSrY+Ts00B7amcclYhXdklTzI6K3S5Idbxf5cjmNqhuoZ/7G0LV9hjoawj2nJqXeSCCaKNuh6otuvbVRHYrOC2GVKy1q5kPJ7qRoJ+4LUVa5Gmj4iURqQhPfZFPf9pbHWWBC8wNxcrISsDSP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6041248)(2016111802025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123562025)(20161123564025)(6072148)(6043046);SRVR:AM3PR02MB227;BCL:0;PCL:0;RULEID:;SRVR:AM3PR02MB227; X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB227;4:WHe0oFca4TpojjvF3ezGmaMLhyvg5bCHoOml/f0pOQ3FRenRyOjmi2Qz2feyh8uo2r3S5GydBDESjfNUVWGgFwDQPfjXUGEPCJR4FpUWamsGYPMhQAb7fadV4gBTTBS3E8eFTEV1PKAIEUu8YzVAhxq0bt7mNZStWzVuRCsHVWEcnwQSKzwaI5E2FVnCe42EoFRoduLDGj+lgGaDFPmEGeFNvrPWsLW2lFKn6M0gsgyTLc++GZgPyCFIwIlpisFLZd3euKXfe/D98SXIpsB1yIOUj6L4ekPjr6fnKKG3yCAGjP0t+eZ8id7wIPCZR8eze7ldgjNDEyc80o4QhPXYCDHvUQnV44wecJbG8eEnZZ9OL43zGWQvkGx6jfhODyF+nn0cMRRXbcPmq5yyAA7RhSC3XNZ2LBPTX+x3KC3CWHZdlaRgmNDDRNDXh/PuKJV1GYXxhjOUlE3lJKiS/sQ1dLF5Mz+gRkrFfaZHRjjYNeeg+/YqSQdDHUdS1YowiY6FLfTCzzoacyOAHIwnmayzQYuhBQU2Ms3lEeA/tPHNhEBvzPi+d+qSJHZrbknlDpNLx7RWbHIKtVDjGAU7sG6wvJu4l4wtdmhzTe7ChqYqaPT0iU9+i217qQgZ1KxzlvAiIOOuonEWHTokA8WjpeM2axosDA+z2rKzs3Cye8q79/5/RiG7DUIrOzzSMT5ayR4gRWZ7zfAF/ALyhjXhGY5w38ROm0KGSt5ad9n7zzGbUYfYfqSmBIxYnq24rUuJBzbowqzpAJbEXMS/G+pBVDjChKZk9ojU0hpK2C7bKhnc+0bhFkX5FjP0levw+4eTdqNCrmfg0qG9IpaJjQ9KVzAeFAffWTC2F6aN5NL/4YSSmm2+1F0MeYH4AtMb2jFzWL6lPMYaURf5zZxAhwSiSLL8Rr2q4tX4Wca0LWa6YVXyeVs= X-Forefront-PRVS: 02973C87BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39410400002)(39400400002)(39840400002)(39450400003)(377424004)(8676002)(50986999)(38730400002)(66066001)(50466002)(65806001)(478600001)(65956001)(230700001)(6116002)(3846002)(81166006)(230783001)(74482002)(47776003)(42186005)(23676002)(33646002)(2906002)(31686004)(5660300001)(54356999)(86362001)(83506001)(65826007)(6666003)(25786009)(4001350100001)(6306002)(53936002)(77096006)(6916009)(305945005)(7736002)(31696002)(2351001)(110136004)(189998001)(36756003)(6486002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM3PR02MB227;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTNQUjAyTUIyMjc7MjM6Qzd5Y3JtNU9vN2o0cFlXVTdjcWhQS0djL2xK?= =?utf-8?B?YVZTaXhsNG9uR2FNYVhVaXQ5N00vZk4zYUl6b2VHZGRJR25xL29HNEpOOVBX?= =?utf-8?B?QjhaQkFuSUlXbGU5MDM3a1BnNGIxUGRNelNjVUFEWE9NOVk3QlBBU3dSeVV0?= =?utf-8?B?NUVhSk52dnV5VGxzMXpEWXE5WTh1bGw0S3BweXNLZjYvcnJRWWdSMmF0U3lx?= =?utf-8?B?eDFWL3VmTG9DM3AyNVFPRDZaZjVHOXpWTFFDTEQ0dDJzUW05Q1pqM0hGUGNC?= =?utf-8?B?bm5VbUtXc3NjUnJFTWhoUUtXR01FNU5zcUUvbTVFUG5uNmxCV2xzdjN6MWFC?= =?utf-8?B?RHVzS2ZPakVLT25pMDAvWEZWaHJQaHV5djVXR1lzcXVRZG1qOFl3ajZqZzli?= =?utf-8?B?TVZtaUd5UW1ac2pVTkNXTFFad1NCRWQwMTlLY0tmOXFtMzBoOGdLMDRncE81?= =?utf-8?B?d0l4TlVYNm9UTkFMaG1XWnR3OG0ydWtuYlkvNkVpWDVJSTE1cjNhMCtabkVS?= =?utf-8?B?b1VBOTFrL2NacCtubmtvRjFzRjlFZ2EvREEyblh2cXZBcFZRSHVOelRDemFC?= =?utf-8?B?OTBxc3pTTUp3YlNXY0wyUHB5R2JUY1lQc2hCeWpBdHJwYVJhV1NaUFl6YjI5?= =?utf-8?B?T1RIekxDMXA1WjJGUHJ3aGdiVmdpOUE2andPaGZRbHdoOHlEclpkNUtBYTlW?= =?utf-8?B?QW00MUxwMW5MUlNnUEJZWUpYcU9NRXB6Ris1VHNpNWVkRFNvek1TSWo1Z09p?= =?utf-8?B?M250RTNkR3liQmE1U2VmTEVqLzNPelZlajkvMWJXa1FSTGcwL1hSdFhCSkto?= =?utf-8?B?YkUzSG9NdlU2UmRLTWpmYU95KzdxUnB2eWZwbnlxcWR1cDVtSGl1N3JnMkp0?= =?utf-8?B?dTVZM0xXai8yUEZkdEZtZkV5UCsyMUtVeVBPZHdUanNVRHZEdTlEOWJ2ell4?= =?utf-8?B?ZXltamR0OUtUT0ZxQW9vUkJJRXk4TzFmTEd1d3ZuN3pBN2ZDMDRnd2dKb2U0?= =?utf-8?B?TS9LUmsyLzlra0tUMVVaSDlGWHRoWUJDMFhhTXY0dG8vQmk2RlZyL0swVjgv?= =?utf-8?B?UVhkcW5Ic1RHWEplbFpleWw5c3NsRnNPR3UrYkw5ako2MFNEV0VSZENMSlNX?= =?utf-8?B?ZUs1bmVkQUp6RUZkRk9HWkk3YUl2Uit3Uk56c29vTnppUFRnVDZXeStJUlMy?= =?utf-8?B?dkdlTFBPWkZrSUs4UWpkekJSejRYRVplU2hMWmhRc1QwSEpzTU0xRkdvT0Jo?= =?utf-8?B?V1NkTzZjWkxnVkVueGtRemhrTTJoTWRWRndOaDJXNm9yYXlXMlh2SGJmWjhI?= =?utf-8?B?RStwK0ZTOHJOU3R6STV3UjVXaE9iUkFkSkgwREV2WmNMWlhxUUM5bUF1WmxN?= =?utf-8?B?S2h4NnVFR3RTMmVHdktKVGV2TlJFdmZpcG9XeTFERUdxMHhoTzZUOWgzY2Fq?= =?utf-8?B?YVlkS3hJZjFYaDhUcmRwRGlPNnIyeXZzTDBEblljcmc5c1NLdjgxZEV5VFIz?= =?utf-8?B?UWhtUWdndkwvMmFrcUhjMWZSeFJRYmo3ckh6SVc3WVNuek9RbG9CTVp6QTh5?= =?utf-8?Q?buR+6PvyvGrPLib1aqFRRyXuF7jP+gwqvYX/iDdrtzo=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB227;6:pJraMS2BKWwkYw91z05yCF25oNZyCphU/sm6jbjS2o/2zlLWdqhthxDHru0CoeYB8mWIyX4PazrWWpEE4ECRYQSkiEoJY7ZFEzU5LzkPVeWGOsMrZdH6qDoAv3ms5mxoDcgkkzSDixnYxQbX7B0DhQG/ugWSqaEhEU209aUQ+JVNRu/kEY+vDudVqTPfnpNtRvMMWMfavTI9AXl7RMCzRkut0VFoR+7feRULd3W4J0PQf8/C9wgG8jyInlc1X5kvEooBhKgsiacb/M9gLhlx0fw2vN3dxM1ZqMQd4yPpf5k8hGqkE2TDnLrOqdzCM5oGgVmFfxte3YoX5lROPxMgVLefab7MUA+2gLbZR3fI44z14nCjDi+BGL/HKheVQPAPlNbnW1GbnAuYyBcpV1yo7ZbjjTEg5Ny1mnaKHfyIRJ2Or9zzP4EoCRW5nBLEs7iJaFbz7SSptJ8JpyjIrWmG1ljrEsUsSGoQI3Hj8n81Ep7HEfBEn0lKeExBCC8NYQstpKT/0nPxa8++is3v4UjXiw==;5:pitIezxGgbo7ON6rMMwIyGuE7VTSFzNzgj7SwdvG1zXQU35elY13cM57VjsxYP1ctJH47vgHMElIpLzPf8YDiElIyEyUj5tML7ErESoa5z6UYhuY8uf0ocxNmKV4f5vwhO0E4wdhR0w2+VrUoBTvKA==;24:0IACLBZ3Npvz4IX0OA5JNEMgYP5GjHB6VcLGyG5n/+8xaBHtkWQP25TQoOYmeLvw+wky8V6NqTeaJFwYvTK0r+7LvahQNI+iQ/MQldCksPM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM3PR02MB227;7:NMoeyjW96p4rTH5n2SI4m7aFBmlRODzinlATvCjqa/brxJ+KZayW85t9/0DYEEv5kQekjp3SyHcOc8yrExnCw22z0zG2wFwJGlcI7MyzJIn+XPHMhoxWzpOvqnCvyqyvUg/G5D6l99JeQcA95a4ImK+QyPMxXppd5okkH6U2x3zK3Czapspv2LtS9ET7c9XhCnwBNWkwzH47bJERfilUtRZd2dDYDSCmFKFBZ+hug4itgkTr6eIhGb0S9hj8odge7vZLoDfcv9Bk3Gtjw34wJPFTXLYa0x5s07droc7Yyf7YCOFqN3Yf3zs5mjWt/U01DxY8HNpRMCmY/q8QcXANxw== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2017 16:11:57.0071 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR02MB227 X-IsSubscribed: yes X-SW-Source: 2017-q2/txt/msg00184.txt.bz2 elf.h does include features.h which should define those. However, on windows there is no features.h. We have the empty features.h in libgnu that depends on config.h being included before (which we can't), and the features.h in lib that is only available when installed in selfcontained mode. Therefore we need a workaround here. Signed-off-by: Ulf Hermann --- tests/ChangeLog | 4 ++++ tests/system-elf-libelf-test.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/tests/ChangeLog b/tests/ChangeLog index 1a77c02..678a882 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -11,6 +11,10 @@ 2017-05-04 Ulf Hermann + * system-elf-libelf-test.c: Define uid_t and gid_t on windows. + +2017-05-04 Ulf Hermann + * elfstrmerge.c: Use 07777 instead of ALLPERMS. 2017-05-04 Ulf Hermann diff --git a/tests/system-elf-libelf-test.c b/tests/system-elf-libelf-test.c index 7dfe498..d9b9cd5 100644 --- a/tests/system-elf-libelf-test.c +++ b/tests/system-elf-libelf-test.c @@ -16,6 +16,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#if ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) +#define uid_t int +#define gid_t int +#endif + #include #include #include "../libelf/libelf.h" -- 2.1.4