From: Jiaying Ren <jiaying.ren@umcloud.com>
Date: Thu, 23 Nov 2017 03:25:30 +0000 (+0800)
Subject: rgw: drop useless includes in rgw_{main.cc, common.h}
X-Git-Tag: v13.0.1~86^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19109%2Fhead;p=ceph.git

rgw: drop useless includes in rgw_{main.cc, common.h}

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
---

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 1818db0cce79..4e06c4f5eae4 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -22,7 +22,6 @@
 
 #include "common/ceph_crypto.h"
 #include "common/perf_counters.h"
-#include "acconfig.h"
 #include "rgw_acl.h"
 #include "rgw_cors.h"
 #include "rgw_iam_policy.h"
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index b24dec27f8ef..6854c13b4a50 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1,21 +1,9 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <signal.h>
-
+extern "C" {
 #include <curl/curl.h>
-
-#include <boost/intrusive_ptr.hpp>
-
-#include "acconfig.h"
+}
 
 #include "common/ceph_argparse.h"
 #include "global/global_init.h"
@@ -29,7 +17,6 @@
 #include "include/stringify.h"
 #include "rgw_common.h"
 #include "rgw_rados.h"
-#include "rgw_user.h"
 #include "rgw_period_pusher.h"
 #include "rgw_realm_reloader.h"
 #include "rgw_rest.h"
@@ -50,7 +37,6 @@
 #include "rgw_log.h"
 #include "rgw_tools.h"
 #include "rgw_resolve.h"
-
 #include "rgw_request.h"
 #include "rgw_process.h"
 #include "rgw_frontend.h"
@@ -58,14 +44,6 @@
 #include "rgw_asio_frontend.h"
 #endif /* WITH_RADOSGW_BEAST_FRONTEND */
 
-#include <map>
-#include <string>
-#include <vector>
-#include <atomic>
-
-#include "include/types.h"
-#include "common/BackTrace.h"
-
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif