From: Mykola Golub <mgolub@suse.com>
Date: Mon, 14 May 2018 18:50:17 +0000 (+0300)
Subject: common: partially revert 95fc248 to make get_process_name work
X-Git-Tag: v12.2.6~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a24f638e48855369c79cb6c0df4cc03bcf0c9788;p=ceph.git

common: partially revert 95fc248 to make get_process_name work

"acconfig.h" is needed for HAVE_SYS_PRCTL_H and <string.h> for memset.

Fixes: http://tracker.ceph.com/issues/24123
Signed-off-by: Mykola Golub <mgolub@suse.com>
(cherry picked from commit e1682de4d3e30c2c4a884ee113ca517a2e627a33)
---

diff --git a/src/common/code_environment.cc b/src/common/code_environment.cc
index 7b106d585fb4..0aab05c76460 100644
--- a/src/common/code_environment.cc
+++ b/src/common/code_environment.cc
@@ -16,10 +16,14 @@
 
 #include <iostream>
 
+#include "acconfig.h"
+
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
 
+#include <string.h>
+
 code_environment_t g_code_env = CODE_ENVIRONMENT_UTILITY;
 
 extern "C" const char *code_environment_to_str(enum code_environment_t e)