From: Sergio Durigan Junior <sergiodj@redhat.com>
To: GDB Patches <gdb-patches@sourceware.org>
Cc: Simon Marchi <simon.marchi@ericsson.com>,
Pedro Alves <palves@redhat.com>,
Joel Brobecker <brobecker@adacore.com>,
Christophe Lyon <christophe.lyon@linaro.org>,
Sergio Durigan Junior <sergiodj@redhat.com>
Subject: [PATCH] Conditionally include "<windows.h>" on common/pathstuff.c (and unbreak build on mingw*)
Date: Thu, 01 Mar 2018 20:20:00 -0000 [thread overview]
Message-ID: <20180301202005.11563-1-sergiodj@redhat.com> (raw)
In-Reply-To: <CAKdteOYtFqn-4Bvd2Tekjpf+h5D-8dTSLKSPXcC7YAMRrJ1TCw@mail.gmail.com>
commit b4987c956dfa44ca9fd8552f63e15f5fa094b2a4
Author: Sergio Durigan Junior <sergiodj@redhat.com>
Date: Fri Feb 9 18:44:59 2018 -0500
Create new common/pathstuff.[ch]
Introduced a regression when compiling for mingw*:
/gdb/common/pathstuff.c: In function 'gdb::unique_xmalloc_ptr<char>
gdb_realpath(const char*)':
/gdb/common/pathstuff.c:56:14: error: 'MAX_PATH' was not declared in this scope
char buf[MAX_PATH];
^
/gdb/common/pathstuff.c:57:5: error: 'DWORD' was not declared in this scope
DWORD len = GetFullPathName (filename, MAX_PATH, buf, NULL);
^
/gdb/common/pathstuff.c:57:11: error: expected ';' before 'len'
DWORD len = GetFullPathName (filename, MAX_PATH, buf, NULL);
^
/gdb/common/pathstuff.c:63:9: error: 'len' was not declared in this scope
if (len > 0 && len < MAX_PATH)
^
/gdb/common/pathstuff.c:64:54: error: 'buf' was not declared in this scope
return gdb::unique_xmalloc_ptr<char> (xstrdup (buf));
^
make[2]: *** [pathstuff.o] Error 1
The proper fix is to conditionally include "<windows.h>". This commit
does that, without introducing any regressions as per tests made by
our BuildBot.
gdb/ChangeLog:
2018-03-01 Sergio Durigan Junior <sergiodj@redhat.com>
PR gdb/22907
* common/pathstuff.c: Conditionally include "<windows.h>".
---
gdb/common/pathstuff.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gdb/common/pathstuff.c b/gdb/common/pathstuff.c
index fc574dc32e..8c4093fc38 100644
--- a/gdb/common/pathstuff.c
+++ b/gdb/common/pathstuff.c
@@ -23,6 +23,10 @@
#include "filenames.h"
#include "gdb_tilde_expand.h"
+#ifdef USE_WIN32API
+#include <windows.h>
+#endif
+
/* See common/pathstuff.h. */
gdb::unique_xmalloc_ptr<char>
--
2.14.3
next prev parent reply other threads:[~2018-03-01 20:20 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-10 1:42 [PATCH 0/2] Make gdbserver work with filename-only binaries Sergio Durigan Junior
2018-02-10 1:42 ` [PATCH 2/2] " Sergio Durigan Junior
2018-02-12 4:18 ` Simon Marchi
2018-02-12 19:16 ` Sergio Durigan Junior
2018-02-21 8:05 ` Joel Brobecker
2018-02-12 19:57 ` [PATCH 0/2] " Sergio Durigan Junior
2018-02-12 19:57 ` [PATCH v2 2/2] " Sergio Durigan Junior
2018-02-13 4:35 ` Simon Marchi
2018-02-22 18:37 ` Sergio Durigan Junior
2018-02-21 12:29 ` Pedro Alves
2018-02-27 0:20 ` Sergio Durigan Junior
2018-02-28 3:32 ` Sergio Durigan Junior
2018-02-12 19:57 ` [PATCH v2 1/2] Create new common/pathstuff.[ch] Sergio Durigan Junior
2018-02-28 3:27 ` [PATCH v3 0/2] Make gdbserver work with filename-only binaries Sergio Durigan Junior
2018-02-28 3:27 ` [PATCH v3 2/2] " Sergio Durigan Junior
2018-02-28 3:58 ` Sergio Durigan Junior
2018-02-28 5:33 ` Simon Marchi
2018-02-28 7:09 ` Metzger, Markus T
2018-02-28 16:30 ` Sergio Durigan Junior
2018-02-28 5:46 ` Simon Marchi
2018-02-28 16:29 ` Sergio Durigan Junior
2018-02-28 16:40 ` Sergio Durigan Junior
2018-02-28 3:27 ` [PATCH v3 1/2] Create new common/pathstuff.[ch] Sergio Durigan Junior
2018-02-28 5:02 ` Simon Marchi
2018-02-28 16:46 ` Sergio Durigan Junior
2018-02-28 16:39 ` Sergio Durigan Junior
2018-03-01 2:23 ` [PATCH v3 0/2] Make gdbserver work with filename-only binaries Sergio Durigan Junior
2018-03-01 2:55 ` Joel Brobecker
2018-03-01 13:08 ` Christophe Lyon
2018-03-01 13:18 ` Simon Marchi
2018-03-01 19:50 ` Sergio Durigan Junior
2018-03-01 20:20 ` Sergio Durigan Junior [this message]
2018-03-01 20:47 ` [PATCH] Conditionally include "<windows.h>" on common/pathstuff.c (and unbreak build on mingw*) Simon Marchi
2018-03-02 11:46 ` Christophe Lyon
2018-03-02 12:35 ` Sergio Durigan Junior
2018-03-02 11:11 ` Yao Qi
2018-03-02 12:29 ` Sergio Durigan Junior
2018-03-02 12:37 ` Sergio Durigan Junior
2018-03-05 12:07 ` Yao Qi
2018-03-02 13:32 ` Eli Zaretskii
2018-03-02 15:15 ` Simon Marchi
2018-03-02 18:20 ` Sergio Durigan Junior
2018-03-03 7:36 ` Eli Zaretskii
2018-03-01 17:37 ` [PATCH v3 0/2] Make gdbserver work with filename-only binaries Sergio Durigan Junior
2018-03-02 3:20 ` Joel Brobecker
2018-02-28 16:47 ` [obvious/pushed] Change order of error message printed when gdbserver can't find CWD Sergio Durigan Junior
2018-02-10 1:42 ` [PATCH 1/2] Create new common/pathstuff.[ch] Sergio Durigan Junior
2018-02-11 22:14 ` Simon Marchi
2018-02-12 19:01 ` Sergio Durigan Junior
2018-02-21 7:56 ` Joel Brobecker
2018-02-22 18:43 ` Sergio Durigan Junior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180301202005.11563-1-sergiodj@redhat.com \
--to=sergiodj@redhat.com \
--cc=brobecker@adacore.com \
--cc=christophe.lyon@linaro.org \
--cc=gdb-patches@sourceware.org \
--cc=palves@redhat.com \
--cc=simon.marchi@ericsson.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).