From debbugs-submit-bounces@debbugs.gnu.org Thu May 30 00:55:59 2024 Received: (at submit) by debbugs.gnu.org; 30 May 2024 04:56:00 +0000 Received: from localhost ([127.0.0.1]:44993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCXpJ-0002K9-14 for submit@debbugs.gnu.org; Thu, 30 May 2024 00:55:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:57450) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCXpG-0002Js-Lr for submit@debbugs.gnu.org; Thu, 30 May 2024 00:55:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCXp6-0000Mr-49 for bug-diffutils@gnu.org; Thu, 30 May 2024 00:55:32 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCXp4-00056q-6d for bug-diffutils@gnu.org; Thu, 30 May 2024 00:55:31 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6f8e98784b3so388554b3a.1 for ; Wed, 29 May 2024 21:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717044928; x=1717649728; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=iSeXhoZqG0cDmGro5/rFVlrK/jzyUDVm9cDpWLC3RHo=; b=L0fxpyeZfREcYPG+1OK3cCA6MIHNaayzZIPIB/Dg3ZG6hJLHs5845ZVbeERfYczX6+ ukPpY4PGqAgyIRGYMZwHZIRD2njBOy9UJJUbRcR9t2cKsh5w5SEWM21fcgTioMv20u7E 9d7XhFYBZDt0c+a0DYw3d4uWynH+gVlUEhvE+cxlk0FchUfez0SfJasHzWc/Wm2wt4F5 7ba7X4LBuOo6RKKPwS/pqEMpTEeoQiAtk+14+MNNl3WupfKVJPAObPGBjauNQNXW4/QM TNdqI4dXrEDPidQiUYxcPi5EsWYqtOxmiL69P7NLtRsG4T30+gkA+idLR7LQCyBKLPh1 zWrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717044928; x=1717649728; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iSeXhoZqG0cDmGro5/rFVlrK/jzyUDVm9cDpWLC3RHo=; b=mBrrd1EE7htgUKazMPj6vQV9sKVHKd5gTZYnIjSU1MlX83s1+8UzHORIYb/7zBvlw0 illI+TB1L+ZDWPjTXIZTW2xptJU46BNn1Rt9ZQjsrR4xi15tBf+7f2vhqpUgJDZuUYrz 8eER4elT51dwtyxGnHigHFs8EBvwechYQ3NLLgwxO0xW/uCFXRcCjqgOKLjOgUGBKDXj pBcEI0qF5DQHvUPvSqs9IQ+9kgef/D3MkDFRSeFfb/NGCDLNml+ldzi3rPP9vYxNh6in OzMaE77hLhsnOy7KQ1hexBIMSk7NGcf4BGkQGMq4YFqADEpGRBv6k6phQhYz0w4QYlCw nDtw== X-Gm-Message-State: AOJu0YzZ3f2JVZa3nLVRNKoH5VupnkGZJD/dBHCXEogZjT9GCWAmoFSR S/BDi6lQJqJsxfbUOxJcpH50+WTf8Y4nhS9OitLRgGN8gHG0vaGhA/zpbjsqmH0= X-Google-Smtp-Source: AGHT+IEdX7+lIGh0ccXcOYCreuBRIeehy3C4V++r86rha67s+pk/DfGZJ8Z9RsClCPlZJ9jSsUoBKA== X-Received: by 2002:a05:6a20:3d8d:b0:1af:e649:6f4 with SMTP id adf61e73a8af0-1b264633301mr1106466637.57.1717044928087; Wed, 29 May 2024 21:55:28 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::3972]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c1a77abb18sm637011a91.57.2024.05.29.21.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 21:55:27 -0700 (PDT) From: Khem Raj To: bug-diffutils@gnu.org Subject: [PATCH 1/2] sdiff: Match execvp argument types Date: Wed, 29 May 2024 21:55:24 -0700 Message-ID: <20240530045525.2652172-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::430; envelope-from=raj.khem@gmail.com; helo=mail-pf1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Khem Raj X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Fixes build with GCC-14 ../../diffutils-3.10/src/sdiff.c:579:28: error: passing argument 2 of '_execvp' from incompatible pointer type [-Wincompatible-pointer-types] 579 | execvp (diffargv[0], (char **) diffargv); | ^~~~~~~~~~~~~~~~~~ | | | char ** * src/sdiff.c (main): execpv expects const pointer. Upstream-Status: Submitted [https://lists.gnu.org/archive/html/diffutils-devel/2024-05/msg00000.html] Signed-off-by: Khem Raj --- src/sdiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdiff.c b/src/sdiff.c index 0b638d4..a4642b1 100644 --- a/src/sdiff.c +++ b/src/sdiff.c @@ -576,7 +576,7 @@ main (int argc, char *argv[]) diffarg (argv[optind]); diffarg (argv[optind + 1]); diffarg (0); - execvp (diffargv[0], (char **) diffargv); + execvp (diffargv[0], diffargv); perror_fatal (diffargv[0]); } else -- 2.45.1 From debbugs-submit-bounces@debbugs.gnu.org Thu May 30 00:56:03 2024 Received: (at submit) by debbugs.gnu.org; 30 May 2024 04:56:03 +0000 Received: from localhost ([127.0.0.1]:45009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCXpX-0002KU-V7 for submit@debbugs.gnu.org; Thu, 30 May 2024 00:56:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:57466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCXpH-0002Jw-UA for submit@debbugs.gnu.org; Thu, 30 May 2024 00:55:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCXp7-0000OD-BA for bug-diffutils@gnu.org; Thu, 30 May 2024 00:55:33 -0400 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCXp5-00056x-DI for bug-diffutils@gnu.org; Thu, 30 May 2024 00:55:33 -0400 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2c19e6dc3dcso394462a91.3 for ; Wed, 29 May 2024 21:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717044930; x=1717649730; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4HgdAtHlAqgkQ1s5vwYdh7ffvDTNMWkYxFQxMFPx4Pk=; b=V/DoYtNf5hhTWAwoQ/xo8mQfnWHinORFHQjVcR5HLGd/nzPW59HwW1DUN3jsP8/GVy ZxwrktrMrrzR6THmt6kw1gHgd/6pzDU2lYRSCCnBXLz0r7Mlh7c/EdkuhopPZ+K3WEBf G0C+/1xLo3wCrU1vTjfCLpbETY5vLaUBhLI5FGbFHvJYM2difm2HtHA4lGR6Jp7NoQbq Cn8SapOc3Djs65mQJcWaNLDQ8NKXY8bUKXsSk1E551yhDXuKIlsH06IupxYD6sGAdvJI aYQL+nbGeRIvDjotNxGj4C+d/JrjYWdwKQ0tlLcbsmWuBrHrlDMhq9QJVKE/L3ZNzC/U s68A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717044930; x=1717649730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4HgdAtHlAqgkQ1s5vwYdh7ffvDTNMWkYxFQxMFPx4Pk=; b=tKBaNh57wN4ZiV1/rVWkThv4dZ+jtmG1qfwahMVgPeXu3TasNQyw6J7slnChd3ywkQ HUJdxVbQV/1sL526coVaZi0ktfr7hv6ln56TkuMlJD8aRzlXU2pE+/UpTKGHu+wNpZMz l4Y6Fk87NbJDpMApUB3bNIKMAbSY0THBZJqIngzFV1/IkDBPYnnGMJgHnafRHa/BTAYL 1UQirYKBJGF35gV0kPMa6dyQ2m/H4lSxgAURtAsaquBq0vmAbexSphtYIi3OYPWYinMn ATgVDs+WuJG0hJ17MrJLHi8yvVMQ/Nh+8QPYZccoyE+kkhl7CnJMkjtlm7bQ8cZOE15h uxoA== X-Gm-Message-State: AOJu0Yxf0UK7xJgl2Ovsnqpo0s4OJejMsy9am3W5ryQSyTXJBqYDKrW+ G6ZUjiyv/pEtHIdgU7yS3sbQfZErQtPKUqDEWTePNgPazpnzrvnSyniE/pagNks= X-Google-Smtp-Source: AGHT+IFfY8+eC3PCV18ZLV8sRIoai/pWQY3FYh0BmNIb1P0LsxEjiCA3C5tAhBxjrkCWCRqC4OkzLg== X-Received: by 2002:a17:90a:4615:b0:2bf:b311:5fe4 with SMTP id 98e67ed59e1d1-2c1abafb5d5mr1147643a91.21.1717044929519; Wed, 29 May 2024 21:55:29 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9d80:4380::3972]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c1a77abb18sm637011a91.57.2024.05.29.21.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 May 2024 21:55:28 -0700 (PDT) From: Khem Raj To: bug-diffutils@gnu.org Subject: [PATCH 2/2] Define stricoll as _stricoll on mingw Date: Wed, 29 May 2024 21:55:25 -0700 Message-ID: <20240530045525.2652172-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240530045525.2652172-1-raj.khem@gmail.com> References: <20240530045525.2652172-1-raj.khem@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=raj.khem@gmail.com; helo=mail-pj1-x1033.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Khem Raj X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * src/system.h: Define stricoll as _stricoll on mingw. Upstream-Status: Submitted [https://lists.gnu.org/archive/html/diffutils-devel/2024-05/msg00001.html] Signed-off-by: Khem Raj --- src/system.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/system.h b/src/system.h index b37893f..4c7a318 100644 --- a/src/system.h +++ b/src/system.h @@ -63,6 +63,16 @@ #include #include +/* stricoll is not provided by any headers on windows/mingw + only _stricoll is provided, the function is however aliased + to provide stricoll in runtime libraries, the configure check + to detect stricoll defines the prototype in generated test + itself and thus test passes, however compiling fails with + GCC-14 which enables implicit-function-declaration as error */ +#if defined _WIN32 && ! defined __CYGWIN__ +#define stricoll _stricoll +#endif + #if ! HAVE_STRCASECOLL # if HAVE_STRICOLL || defined stricoll # define strcasecoll(a, b) stricoll (a, b) -- 2.45.1