From 148afd11700aedcd23cee8a6dc2196f94a8fc7b6 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Sat, 18 Mar 2017 10:15:50 -0700
Subject: Rename file_loc.h to xrdp_sockets.h, install it

Include xrdp_sockets.h directly, not through headers.
---
 common/Makefile.am    |  4 ++--
 common/file_loc.h     | 31 -------------------------------
 common/xrdp_sockets.h | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 common/file_loc.h
 create mode 100644 common/xrdp_sockets.h

(limited to 'common')

diff --git a/common/Makefile.am b/common/Makefile.am
index dab9d524..bfccca90 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -9,7 +9,8 @@ EXTRA_DIST = pixman-region.c
 include_HEADERS = \
   xrdp_client_info.h \
   xrdp_constants.h \
-  xrdp_rail.h
+  xrdp_rail.h \
+  xrdp_sockets.h
 
 AM_CPPFLAGS = \
   -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \
@@ -36,7 +37,6 @@ libcommon_la_SOURCES = \
   fifo.h \
   file.c \
   file.h \
-  file_loc.h \
   list.c \
   list.h \
   list16.c \
diff --git a/common/file_loc.h b/common/file_loc.h
deleted file mode 100644
index 45178964..00000000
--- a/common/file_loc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * xrdp: A Remote Desktop Protocol server.
- *
- * Copyright (C) Jay Sorg 2004-2014
- *
- * Licensed 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * default file locations for log, config, etc
- */
-
-#if !defined(FILE_LOC_H)
-#define FILE_LOC_H
-
-#define XRDP_CHANSRV_STR      XRDP_SOCKET_PATH "/xrdp_chansrv_socket_%d"
-#define CHANSRV_PORT_OUT_STR  XRDP_SOCKET_PATH "/xrdp_chansrv_audio_out_socket_%d"
-#define CHANSRV_PORT_IN_STR   XRDP_SOCKET_PATH "/xrdp_chansrv_audio_in_socket_%d"
-#define CHANSRV_API_STR       XRDP_SOCKET_PATH "/xrdpapi_%d"
-#define XRDP_X11RDP_STR       XRDP_SOCKET_PATH "/xrdp_display_%d"
-#define XRDP_DISCONNECT_STR   XRDP_SOCKET_PATH "/xrdp_disconnect_display_%d"
-
-#endif
diff --git a/common/xrdp_sockets.h b/common/xrdp_sockets.h
new file mode 100644
index 00000000..92be08ae
--- /dev/null
+++ b/common/xrdp_sockets.h
@@ -0,0 +1,31 @@
+/**
+ * xrdp: A Remote Desktop Protocol server.
+ *
+ * Copyright (C) Jay Sorg 2004-2014
+ *
+ * Licensed 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * names of UNIX sockets for inter-process communication
+ */
+
+#if !defined(XRDP_SOCKETS_H)
+#define XRDP_SOCKETS_H
+
+#define XRDP_CHANSRV_STR      XRDP_SOCKET_PATH "/xrdp_chansrv_socket_%d"
+#define CHANSRV_PORT_OUT_STR  XRDP_SOCKET_PATH "/xrdp_chansrv_audio_out_socket_%d"
+#define CHANSRV_PORT_IN_STR   XRDP_SOCKET_PATH "/xrdp_chansrv_audio_in_socket_%d"
+#define CHANSRV_API_STR       XRDP_SOCKET_PATH "/xrdpapi_%d"
+#define XRDP_X11RDP_STR       XRDP_SOCKET_PATH "/xrdp_display_%d"
+#define XRDP_DISCONNECT_STR   XRDP_SOCKET_PATH "/xrdp_disconnect_display_%d"
+
+#endif
-- 
cgit v1.2.1