Fold procimpl.h into process.cxx

Change-Id: I1adcaeea7a1a3f7a3634897821f15443dbc78e94

2 files changed, 8 insertions, 44 deletions

diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index 5429d7a2ac90..7b6ec07bc9cf 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -46,6 +46,7 @@
 #endif
 #include <osl/diagnose.h>
 #include <osl/mutex.h>
+#include <osl/process.h>
 #include <osl/conditn.h>
 #include <osl/thread.h>
 #include <osl/file.h>
@@ -57,7 +58,6 @@
 
 #include "createfilehandlefromfd.hxx"
 #include "file_url.hxx"
-#include "procimpl.h"
 #include "readwrite_helper.h"
 #include "sockimpl.h"
 #include "secimpl.h"
@@ -68,6 +68,13 @@
 namespace
 {
 
+struct oslProcessImpl {
+    pid_t           m_pid;
+    oslCondition    m_terminated;
+    int             m_status;
+    oslProcessImpl* m_pnext;
+};
+
 struct ProcessData
 {
     const sal_Char*  m_pszArgs[MAX_ARGS + 1];
diff --git a/sal/osl/unx/procimpl.h b/sal/osl/unx/procimpl.h
deleted file mode 100644
index 37b5cce12964..000000000000
--- a/sal/osl/unx/procimpl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _OSL_PROCIMPL_H_
-#define _OSL_PROCIMPL_H_
-
-#include <osl/process.h>
-#include <osl/conditn.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _oslProcessImpl {
-    pid_t                   m_pid;
-    oslCondition            m_terminated;
-    int                     m_status;
-    struct _oslProcessImpl* m_pnext;
-} oslProcessImpl;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */