This is an archive of the discontinued LLVM Phabricator instance.

Differential D67910

[LLDB] Avoid warnings about redefining posix mode defines on MinGW
ClosedPublic

Authored by mstorsjo on Sep 23 2019, 5:19 AM.

Details

Reviewers
hhb
amccarth
labath
Commits
rG3abbd43a5954: [LLDB] Avoid warnings about redefining posix mode defines on MinGW
rL372700: [LLDB] Avoid warnings about redefining posix mode defines on MinGW
rLLDB372700: [LLDB] Avoid warnings about redefining posix mode defines on MinGW
Summary

Since these defines were added in LLVM SVN r189364 in 2013, mingw-w64 got defines for S_I?GRP, S_IRWXG, S_I?OTH and S_IRWXO in 2015.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Sep 23 2019, 5:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 23 2019, 5:19 AM
Herald added subscribers: JDevlieghere, abidh. · View Herald Transcript
hhb accepted this revision.Sep 23 2019, 3:36 PM
hhb added inline comments.
lldb/include/lldb/Host/windows/PosixApi.h
39 ↗(On Diff #221298)

Maybe move these into the defined(_MSC_VER) above? Or the other way? Seems they should be consistent.

This revision is now accepted and ready to land.Sep 23 2019, 3:36 PM
mstorsjo marked an inline comment as done.Sep 23 2019, 11:21 PM
mstorsjo added inline comments.
lldb/include/lldb/Host/windows/PosixApi.h
39 ↗(On Diff #221298)

I don't want to move them into the _MSC_VER ifdef above, as there are pretty recent mingw-w64 releases without these new defines as well (the new ones were only added in mingw-w64 v4), but I guess I could change the _MSC_VER ifdef to check for S_IRUSR instead.

Closed by commit rL372700: [LLDB] Avoid warnings about redefining posix mode defines on MinGW (authored by mstorsjo). · Explain WhySep 24 2019, 1:40 AM
This revision was automatically updated to reflect the committed changes.
Herald added a project: Restricted Project. · View Herald TranscriptSep 24 2019, 1:40 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

PathSize
lldb/
trunk/
include/
lldb/
Host/
windows/
12 lines

Diff 221481

lldb/trunk/include/lldb/Host/windows/PosixApi.h

Show All 25 Lines
#endif #endif
#define O_NOCTTY 0 #define O_NOCTTY 0
#define O_NONBLOCK 0 #define O_NONBLOCK 0
#define SIGTRAP 5 #define SIGTRAP 5
#define SIGKILL 9 #define SIGKILL 9
#define SIGSTOP 20 #define SIGSTOP 20
#if defined(_MSC_VER) #ifndef S_IRUSR
#define S_IRUSR S_IREAD /* read, user */ #define S_IRUSR S_IREAD /* read, user */
#define S_IWUSR S_IWRITE /* write, user */ #define S_IWUSR S_IWRITE /* write, user */
#define S_IXUSR 0 /* execute, user */ #define S_IXUSR 0 /* execute, user */
#endif #endif
#ifndef S_IRGRP
#define S_IRGRP 0 /* read, group */ #define S_IRGRP 0 /* read, group */
#define S_IWGRP 0 /* write, group */ #define S_IWGRP 0 /* write, group */
#define S_IXGRP 0 /* execute, group */ #define S_IXGRP 0 /* execute, group */
#endif
#ifndef S_IROTH
#define S_IROTH 0 /* read, others */ #define S_IROTH 0 /* read, others */
#define S_IWOTH 0 /* write, others */ #define S_IWOTH 0 /* write, others */
#define S_IXOTH 0 /* execute, others */ #define S_IXOTH 0 /* execute, others */
#endif
#ifndef S_IRWXU
#define S_IRWXU 0 #define S_IRWXU 0
#endif
#ifndef S_IRWXG
#define S_IRWXG 0 #define S_IRWXG 0
#endif
#ifndef S_IRWXO
#define S_IRWXO 0 #define S_IRWXO 0
#endif
#if HAVE_SYS_TYPES_H #if HAVE_SYS_TYPES_H
// pyconfig.h typedefs this. We require python headers to be included before // pyconfig.h typedefs this. We require python headers to be included before
// any LLDB headers, but there's no way to prevent python's pid_t definition // any LLDB headers, but there's no way to prevent python's pid_t definition
// from leaking, so this is the best option. // from leaking, so this is the best option.
#ifndef NO_PID_T #ifndef NO_PID_T
#include <sys/types.h> #include <sys/types.h>
#endif #endif
▲ Show 20 Lines • Show All 62 Lines • Show Last 20 Lines