This is an archive of the discontinued LLVM Phabricator instance.

Differential D13022

Use fcntl.h to retrieve the O_CREAT and O_RDRW constants.
ClosedPublic

Authored by vkalintiris on Sep 21 2015, 6:56 AM.

Details

Reviewers
emaste
krytarowski
clayborg
Commits
rG44562da81156: Use fcntl.h to retrieve the O_CREAT and O_RDWR constants.
rLLDB248255: Use fcntl.h to retrieve the O_CREAT and O_RDWR constants.
rL248255: Use fcntl.h to retrieve the O_CREAT and O_RDWR constants.
Summary

Normally, these macros are defined in fnctl.h. However, GLIBC exposes their
definition through <sys/file.h> too. This change allows us to compile LLDB
with non-GLIBC C libraries.

Diff Detail

Repository
rL LLVM

Event Timeline

vkalintiris updated this revision to Diff 35255.Sep 21 2015, 6:56 AM
vkalintiris retitled this revision from to Use fcntl.h to retrieve the O_CREAT and O_RDRW constants..
vkalintiris updated this object.
vkalintiris added a reviewer: clayborg.
vkalintiris added a subscriber: lldb-commits.
emaste accepted this revision.Sep 21 2015, 7:18 AM
emaste added a reviewer: emaste.
emaste added a subscriber: emaste.

LGTM

Although it ought to remain on the same line, no?

This revision is now accepted and ready to land.Sep 21 2015, 7:18 AM
vkalintiris updated this revision to Diff 35258.Sep 21 2015, 8:03 AM
vkalintiris updated this object.
vkalintiris edited edge metadata.

Use fcntl.h instead of sys/fcntl.h.

vkalintiris added a comment.Sep 21 2015, 8:07 AM
In D13022#249823, @emaste wrote:

Although it ought to remain on the same line, no?

It shouldn't matter in this case. I just followed the order of the headers in the synopsis section of shm_open(3) on my system.
However, I noticed that we should use fcntl.h instead of sys/fcntl.h. The former is POSIX-compatible while the latter (based on my understanding) is being used to expose additional kernel-defines in some systems. Does this look good to you?

emaste added a comment.Sep 21 2015, 8:52 AM

Yes, updated change LGTM.

clayborg accepted this revision.Sep 21 2015, 9:34 AM
clayborg edited edge metadata.

Looks good.

krytarowski accepted this revision.Sep 21 2015, 10:52 AM
krytarowski added a reviewer: krytarowski.
krytarowski added a subscriber: krytarowski.

You mean O_RDWR, not O_RDRW.

The patch is correct on NetBSD.

Closed by commit rL248255: Use fcntl.h to retrieve the O_CREAT and O_RDWR constants. (authored by vkalintiris). · Explain WhySep 22 2015, 2:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
source/
Core/
2 lines

Diff 35352

lldb/trunk/source/Core/ConnectionSharedMemory.cpp

Show All 10 Lines
#include "lldb/Core/ConnectionSharedMemory.h" #include "lldb/Core/ConnectionSharedMemory.h"
// C Includes // C Includes
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef _WIN32 #ifdef _WIN32
#include "lldb/Host/windows/windows.h" #include "lldb/Host/windows/windows.h"
#else #else
#include <sys/file.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h>
#endif #endif
// C++ Includes // C++ Includes
// Other libraries and framework includes // Other libraries and framework includes
// Project includes // Project includes
#include "llvm/Support/MathExtras.h" #include "llvm/Support/MathExtras.h"
#include "lldb/Core/Communication.h" #include "lldb/Core/Communication.h"
#include "lldb/Core/Log.h" #include "lldb/Core/Log.h"
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines