From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id A4B133858022 for ; Mon, 26 Sep 2022 09:13:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A4B133858022 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x333.google.com with SMTP id r133-20020a1c448b000000b003b494ffc00bso7096967wma.0 for ; Mon, 26 Sep 2022 02:13:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=UbTiCuoSDHMiE2geqrF7sa2uJ1FVlN83CLNdxFC4pUM=; b=N3XmTJg7uUbD6P5S3fYzkSXyAA37cpzq68vScDjY0+cxpZ8Tq/A/wZ4ty8fbopg82P +auRdWSpMzvdCZrhLSP3+VTKfBxORb5RE1mIh5LIFtyoMn9ACwym3I34RzouHa+nYlKC yj42o9W3stW7dhvmrkLRYvBBEKZevquH3gv9kj6aI9G26NSxuZdxQEDzCiFHiHhZzVDe XWYSXLuzIXYqUpWGMaCvjJztYjYKRIl+5YSP/lgAH61yTXeqeeU0kcLLsVGm2F0wmqCR RT4TpLZvj7Uuf92VLev6hdlpuusRZwRuRz6Qr31fD8fmBhQoRu0jTTeJuPFYVohoGWla 4IFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=UbTiCuoSDHMiE2geqrF7sa2uJ1FVlN83CLNdxFC4pUM=; b=7dyc4w62dZe6toXiRHbuROYtk+h5Jglc28RNoTceLrzUqRMWFJx5+Ou/bzLuCFUBu1 LjCYEAcTQKvg64uWAm9xBxVLZyM4FR9mc/qJoHktHJdQjaaiMajTFtw3CSoo/Ue3bRj2 KAGaFUYUCnyCANRvRZ3baqJJJbDXZiNIwSzOc9HFaM6Y1CB+Nxd+M0X3hW8qxXh4Sf+E tK4eHPC5BQ564eZVM+jw560lGYcRtSWzhX6JzdANTWzxmWLm49Hq1D4wr9YwaYDE2/Sr yUW7QvBqs6+vBnhw70tJJ8726wNw31yzOpec/q/xRjHxhueTDyZG5UW0CF6dW69LHFF/ WQLg== X-Gm-Message-State: ACrzQf3q/icZSYb7Of4H9T3qpS59xF17s/98fLtyBoKByYnU6AMbJFAU JmA7oUaMbA+cegliDaEz0VogX19u0R6EWQ== X-Google-Smtp-Source: AMsMyM46ZcXQbwcgF3PFzwkodP6cNn92EqoFODXwYKGLZjP1HDuh2P1V5QzeyfENnKNFmLsHBNF1bA== X-Received: by 2002:a05:600c:548b:b0:3b5:95b:57d3 with SMTP id iv11-20020a05600c548b00b003b5095b57d3mr12253106wmb.153.1664183624335; Mon, 26 Sep 2022 02:13:44 -0700 (PDT) Received: from localhost.localdomain (static-176-191-105-132.ftth.abo.bbox.fr. [176.191.105.132]) by smtp.gmail.com with ESMTPSA id s8-20020adfeb08000000b0022b1ffa7480sm16181981wrn.0.2022.09.26.02.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 02:13:44 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITED] ada: Remove socket definitions for ancient MinGW Date: Mon, 26 Sep 2022 11:13:41 +0200 Message-Id: <20220926091341.272596-1-poulhies@adacore.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Piotr Trojanek Modern MinGW defines _WIN32_WINNT as 0xa00, so there is no need go guard against it being lower than 0x0600 or setting it to 0x0501. gcc/ada/ * gsocket.h: Remove redefinition of _WIN32_WINNT. * mingw32.h: Remove conditional definition of _WIN32_WINNT. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gsocket.h | 6 ------ gcc/ada/mingw32.h | 5 ----- 2 files changed, 11 deletions(-) diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h index e7284a1ef4e..561f2ffb566 100644 --- a/gcc/ada/gsocket.h +++ b/gcc/ada/gsocket.h @@ -80,12 +80,6 @@ #define FD_SETSIZE 1024 #ifdef __MINGW32__ -/* winsock2.h allows WSAPoll related definitions only when - * _WIN32_WINNT >= 0x0600 */ -#if !defined(_WIN32_WINNT) || _WIN32_WINNT < 0x0600 -#define _WIN32_WINNT 0x0600 -#endif - #include #include #include diff --git a/gcc/ada/mingw32.h b/gcc/ada/mingw32.h index a190d51076f..d038211a1dc 100644 --- a/gcc/ada/mingw32.h +++ b/gcc/ada/mingw32.h @@ -44,11 +44,6 @@ #define UNICODE /* For Win32 API */ #endif -/* We need functionality available only starting with Windows XP */ -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0501 -#endif - #ifndef __CYGWIN__ #include #endif -- 2.25.1