This is an archive of the discontinued LLVM Phabricator instance.

Differential D12748

Include platform agnostic <GetOptInc.h> in the place of <getopt.h>
ClosedPublic

Authored by krytarowski on Sep 9 2015, 6:29 PM.

Details

Reviewers
joerg
brucem
Commits
rGc32c277b8424: Include platform agnostic <HostGetOpt.h> in the place of <getopt.h>
rLLDB248990: Include platform agnostic <HostGetOpt.h> in the place of <getopt.h>
rL248990: Include platform agnostic <HostGetOpt.h> in the place of <getopt.h>
Summary

Problem caught on NetBSD with missing getopt_long_only(3).

Diff Detail

Repository
rL LLVM

Event Timeline

krytarowski updated this revision to Diff 34399.Sep 9 2015, 6:29 PM
krytarowski retitled this revision from to Include platform agnostic <GetOptInc.h> in the place of <getopt.h>.
krytarowski updated this object.
krytarowski added a reviewer: joerg.
krytarowski set the repository for this revision to rL LLVM.
krytarowski added a subscriber: lldb-commits.
krytarowski added a comment.Sep 18 2015, 5:52 AM

Any interest?

brucem added a subscriber: brucem.Sep 27 2015, 11:53 PM
brucem added inline comments.
tools/lldb-server/lldb-gdbserver.cpp
10

I suspect that this should #include "lldb/Host/HostGetOpt.h" instead, and that it should be down below with the other Host includes.

krytarowski updated this revision to Diff 35923.Sep 28 2015, 4:23 PM

Put the include into proper line and use "" instead of <>.

brucem requested changes to this revision.Sep 29 2015, 2:11 AM
brucem added a reviewer: brucem.
brucem added inline comments.
tools/lldb-server/lldb-gdbserver.cpp
32

This should be lldb/Host/HostGetOpt.h and not lldb/Host/common/GetOptInc.h.

This revision now requires changes to proceed.Sep 29 2015, 2:11 AM
krytarowski updated this revision to Diff 35950.Sep 29 2015, 2:53 AM
krytarowski edited edge metadata.

Use proper include.

brucem accepted this revision.Oct 1 2015, 12:18 AM
brucem edited edge metadata.
This revision is now accepted and ready to land.Oct 1 2015, 12:18 AM
Closed by commit rL248990: Include platform agnostic <HostGetOpt.h> in the place of <getopt.h> (authored by brucem). · Explain WhyOct 1 2015, 12:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
tools/
lldb-server/
3 lines

Diff 34399

tools/lldb-server/lldb-gdbserver.cpp

//===-- lldb-gdbserver.cpp --------------------------------------*- C++ -*-===// //===-- lldb-gdbserver.cpp --------------------------------------*- C++ -*-===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
// //
// This file is distributed under the University of Illinois Open Source // This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details. // License. See LICENSE.TXT for details.
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include <lldb/Host/common/GetOptInc.h>
brucemUnsubmitted
Not Done
ReplyInline Actions

I suspect that this should #include "lldb/Host/HostGetOpt.h" instead, and that it should be down below with the other Host includes.

brucem: I suspect that this should `#include "lldb/Host/HostGetOpt.h"` instead, and that it should be…
// C Includes // C Includes
#include <errno.h> #include <errno.h>
#include <getopt.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifndef _WIN32 #ifndef _WIN32
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
#endif #endif
// C++ Includes // C++ Includes
// Other libraries and framework includes // Other libraries and framework includes
#include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringRef.h"
#include "lldb/Core/ConnectionMachPort.h" #include "lldb/Core/ConnectionMachPort.h"
#include "lldb/Core/Error.h" #include "lldb/Core/Error.h"
#include "lldb/Core/PluginManager.h" #include "lldb/Core/PluginManager.h"
#include "lldb/Host/ConnectionFileDescriptor.h" #include "lldb/Host/ConnectionFileDescriptor.h"
brucemUnsubmitted
Not Done
ReplyInline Actions

This should be lldb/Host/HostGetOpt.h and not lldb/Host/common/GetOptInc.h.

brucem: This should be `lldb/Host/HostGetOpt.h` and not `lldb/Host/common/GetOptInc.h`.
#include "lldb/Host/HostThread.h" #include "lldb/Host/HostThread.h"
#include "lldb/Host/OptionParser.h" #include "lldb/Host/OptionParser.h"
#include "lldb/Host/Pipe.h" #include "lldb/Host/Pipe.h"
#include "lldb/Host/Socket.h" #include "lldb/Host/Socket.h"
#include "lldb/Host/StringConvert.h" #include "lldb/Host/StringConvert.h"
#include "lldb/Host/ThreadLauncher.h" #include "lldb/Host/ThreadLauncher.h"
#include "lldb/Target/Platform.h" #include "lldb/Target/Platform.h"
#include "LLDBServerUtilities.h" #include "LLDBServerUtilities.h"
▲ Show 20 Lines • Show All 635 Lines • Show Last 20 Lines