From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-72198-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 3987 invoked by alias); 16 Apr 2010 17:15:49 -0000
Received: (qmail 3972 invoked by uid 22791); 16 Apr 2010 17:15:47 -0000
X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 	tests=BAYES_00,T_RP_MATCHES_RCVD
X-Spam-Check-By: sourceware.org
Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100)     by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 16 Apr 2010 17:15:40 +0000
Received: (qmail 7910 invoked from network); 16 Apr 2010 17:15:39 -0000
Received: from unknown (HELO orlando.localnet) (pedro@127.0.0.2)   by mail.codesourcery.com with ESMTPA; 16 Apr 2010 17:15:39 -0000
From: Pedro Alves <pedro@codesourcery.com>
To: "Pierre Muller" <pierre.muller@ics-cnrs.unistra.fr>
Subject: Re: [RFC] Mingw Windows 64-bit gdbserver
Date: Fri, 16 Apr 2010 17:15:00 -0000
User-Agent: KMail/1.12.2 (Linux/2.6.31-20-generic; KDE/4.3.2; x86_64; ; )
Cc: gdb-patches@sourceware.org
References: <000d01cadd79$efa9e2b0$cefda810$@muller@ics-cnrs.unistra.fr> <201004161727.26943.pedro@codesourcery.com> <001f01cadd83$3e5e6b70$bb1b4250$@muller@ics-cnrs.unistra.fr>
In-Reply-To: <001f01cadd83$3e5e6b70$bb1b4250$@muller@ics-cnrs.unistra.fr>
MIME-Version: 1.0
Content-Type: Text/Plain;   charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201004161815.36864.pedro@codesourcery.com>
X-IsSubscribed: yes
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
X-SW-Source: 2010-04/txt/msg00517.txt.bz2

On Friday 16 April 2010 17:38:28, Pierre Muller wrote:
>   GDb sources is still a mix:
> 
> > Typo: I meant winsock2.h instead of winsock.h.
> 
> $ grep "include.*<winso" *.h  gdbserver/*.h *.c gdbserver/*.c
> gdb_select.h:#include <winsock2.h>
> serial.h:#include <winsock2.h>
> m32r-rom.c:#include <winsock.h>
> remote-m32r-sdi.c:#include <winsock.h>
> ser-base.c:#include <winsock2.h>
> ser-tcp.c:#include <winsock2.h>
> gdbserver/gdbreplay.c:#include <winsock.h>
> gdbserver/remote-utils.c:#include <winsock.h>
> 
> should all be moved to winsock2.h?

Probably not a real problem as we only activate
Winsock 1:

gdb/
>grep WSAStart *.c -rn
m32r-rom.c:451:      if (WSAStartup (MAKEWORD (1, 1), &wd))
ser-mingw.c:1255:  if (WSAStartup (MAKEWORD (1, 0), &wsa_data) != 0)

gdb/gdbserver/
>grep WSAStart *.c -rn
gdbreplay.c:207:          WSAStartup (MAKEWORD (1, 0), &wsad);
remote-utils.c:288:       WSAStartup (MAKEWORD (1, 0), &wsad);

Presumably winsock2.h is a superset of winsock.h and so we're
likely fine.  Wouldn't hurt to be consistent, moreso since we
include winsock2.h in some headers.

> and -lws2_32 as library?

You mean in gdbserver?  Shouldn't hurt, yeah.

> By the way, do the m32r sources still link correctly currently?

No idea.  There were recent changes to some of those
files though.

-- 
Pedro Alves