summaryrefslogtreecommitdiff
path: root/desktop/unx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-04-13 23:26:48 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-04-13 23:26:48 +0200
commitf5051821bc5da0fa7b3de78d21aee305fce3d46b (patch)
tree7831807eec592a6471aac59c5f567ea82dd6a23e /desktop/unx
parentf7ea60218ae96cda55dc39073fac807df64f18de (diff)
Clean up function declarations and some unused functions
Change-Id: Ie35d71a03d2f89cd72836db21fac8746a9e85b09
Diffstat (limited to 'desktop/unx')
-rw-r--r--desktop/unx/source/pagein.c3
-rw-r--r--desktop/unx/source/pagein.h29
-rw-r--r--desktop/unx/source/start.c4
3 files changed, 31 insertions, 5 deletions
diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index ef1f932b3227..6ffa07bd8809 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -18,6 +18,7 @@
*/
#include "file_image.h"
+#include "pagein.h"
#include <unistd.h>
#include <errno.h>
@@ -49,8 +50,6 @@ cleanup_and_leave:
return (result);
}
-extern int pagein_execute (int argc, char **argv);
-
/* main */
int pagein_execute (int argc, char **argv)
{
diff --git a/desktop/unx/source/pagein.h b/desktop/unx/source/pagein.h
new file mode 100644
index 000000000000..929bab81fe05
--- /dev/null
+++ b/desktop/unx/source/pagein.h
@@ -0,0 +1,29 @@
+/* -*- 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 INCLUDED_DESKTOP_UNX_SOURCE_PAGEIN_H
+#define INCLUDED_DESKTOP_UNX_SOURCE_PAGEIN_H
+
+#include <sal/config.h>
+
+int pagein_execute(int argc, char **argv);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 77464b1f4c46..13be4a46cfb6 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -35,6 +35,7 @@
#include "args.h"
#include "../../source/inc/exithelper.h"
+#include "pagein.h"
#include "splashx.h"
#define PIPEDEFAULTPATH "/tmp"
@@ -598,9 +599,6 @@ system_checks( void )
#endif
}
-/* re-use the pagein code */
-extern int pagein_execute (int argc, char **argv);
-
static char *build_pagein_path (Args *args, const char *pagein_name)
{
char *path;