From 4b376e26abe74c5cffd6a66c02179d06dff08429 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Fri, 28 Aug 2020 11:54:48 -0300
Subject: [PATCH] Cretating include dir and files based on operating system.

---
 Makefile.in                           |  4 +++-
 lib3270.cbp                           |  7 +++++++
 src/core/iocalls.c                    |  2 +-
 src/core/linux/connect.c              |  2 +-
 src/core/linux/util.c                 |  2 +-
 src/core/telnet.c                     |  4 +++-
 src/core/windows/connect.c            |  1 +
 src/core/windows/event_dispatcher.c   |  1 +
 src/core/windows/http.c               |  1 +
 src/core/windows/util.c               |  1 +
 src/include/internals.h               |  2 +-
 src/include/lib3270.h                 | 26 --------------------------
 src/include/lib3270/internals.h       |  2 +-
 src/include/linux/lib3270/os.h        | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/include/macos/lib3270/os.h        | 43 +++++++++++++++++++++++++++++++++++++++++++
 src/include/windows/lib3270/os.h      | 44 ++++++++++++++++++++++++++++++++++++++++++++
 src/include/windows/lib3270/win32.h   | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/network_modules/openssl/context.c |  4 ++++
 src/network_modules/openssl/private.h |  2 +-
 src/network_modules/tools.c           |  3 +++
 src/ssl/notify.c                      |  1 +
 src/testprogram/testprogram.c         |  4 ++++
 22 files changed, 243 insertions(+), 34 deletions(-)
 create mode 100644 src/include/linux/lib3270/os.h
 create mode 100644 src/include/macos/lib3270/os.h
 create mode 100644 src/include/windows/lib3270/os.h
 create mode 100644 src/include/windows/lib3270/win32.h

diff --git a/Makefile.in b/Makefile.in
index 02d6e42..77543b1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -107,12 +107,14 @@ DEPENDS= \
 	Makefile \
 	src/include/*.h \
 	src/include/lib3270/*.h \
+	src/include/@OSNAME@/lib3270/*.h \
 	$(BASEDIR)/src/include/lib3270/actions.h
 
 CFLAGS= \
 	@CFLAGS@ \
 	-g \
 	-I$(BASEDIR)/src/include \
+	-I$(BASEDIR)/src/include/@OSNAME@ \
 	@LIBSSL_CFLAGS@ \
 	@LDAP_CFLAGS@ \
 	@LIBCURL_CFLAGS@
@@ -323,7 +325,7 @@ install-dev: \
 	@mkdir -p $(DESTDIR)$(includedir)/lib3270
 
 	@$(INSTALL_DATA) \
-		src/include/lib3270/*.h \
+		src/include/@OSNAME@/lib3270/*.h \
 		$(DESTDIR)$(includedir)/lib3270
 
 	@$(INSTALL_DATA) \
diff --git a/lib3270.cbp b/lib3270.cbp
index 7692adb..7582bb0 100644
--- a/lib3270.cbp
+++ b/lib3270.cbp
@@ -254,6 +254,8 @@
 			<Option compilerVar="CC" />
 		</Unit>
 		<Unit filename="src/include/3270ds.h" />
+		<Unit filename="src/include/X11keysym.h" />
+		<Unit filename="src/include/action_table.h" />
 		<Unit filename="src/include/ansic.h" />
 		<Unit filename="src/include/arpa_telnet.h" />
 		<Unit filename="src/include/array.h" />
@@ -269,6 +271,7 @@
 		<Unit filename="src/include/hostc.h" />
 		<Unit filename="src/include/internals.h" />
 		<Unit filename="src/include/kybdc.h" />
+		<Unit filename="src/include/lib3270++.h" />
 		<Unit filename="src/include/lib3270.h" />
 		<Unit filename="src/include/lib3270/actions.h" />
 		<Unit filename="src/include/lib3270/charset.h" />
@@ -284,7 +287,9 @@
 		<Unit filename="src/include/lib3270/toggle.h" />
 		<Unit filename="src/include/lib3270/trace.h" />
 		<Unit filename="src/include/linkedlist.h" />
+		<Unit filename="src/include/linux/lib3270/os.h" />
 		<Unit filename="src/include/localdefs.h" />
+		<Unit filename="src/include/macos/lib3270/os.h" />
 		<Unit filename="src/include/networking.h" />
 		<Unit filename="src/include/popupsc.h" />
 		<Unit filename="src/include/proxyc.h" />
@@ -305,6 +310,8 @@
 		<Unit filename="src/include/utilc.h" />
 		<Unit filename="src/include/w3miscc.h" />
 		<Unit filename="src/include/widec.h" />
+		<Unit filename="src/include/windows/lib3270/os.h" />
+		<Unit filename="src/include/windows/lib3270/win32.h" />
 		<Unit filename="src/include/winversc.h" />
 		<Unit filename="src/include/xioc.h" />
 		<Unit filename="src/include/xl.h" />
diff --git a/src/core/iocalls.c b/src/core/iocalls.c
index 0722db8..4a091dd 100644
--- a/src/core/iocalls.c
+++ b/src/core/iocalls.c
@@ -36,6 +36,7 @@
 #include "telnetc.h"
 #include "utilc.h"
 #include "kybdc.h"
+#include <lib3270/os.h>
 
 #if defined(_WIN32)
 	#include <ws2tcpip.h>
@@ -45,7 +46,6 @@
 	#include <sys/ioctl.h>
 	#include <netinet/in.h>
 	#include <netdb.h>
-	#include <unistd.h>
 	#include <fcntl.h>
 #endif
 
diff --git a/src/core/linux/connect.c b/src/core/linux/connect.c
index 6b7bbde..84b1ef0 100644
--- a/src/core/linux/connect.c
+++ b/src/core/linux/connect.c
@@ -39,7 +39,6 @@
 #include <sys/ioctl.h>
 #include <netinet/in.h>
 #include <netdb.h>
-#include <unistd.h>
 #include <fcntl.h>
 
 #include <stdlib.h>
@@ -53,6 +52,7 @@
 #include <lib3270/internals.h>
 #include <lib3270/log.h>
 #include <lib3270/trace.h>
+#include <lib3270/os.h>
 #include <networking.h>
 //#include <fcntl.h>
 #include <poll.h>
diff --git a/src/core/linux/util.c b/src/core/linux/util.c
index 4715b3a..8acc2ff 100644
--- a/src/core/linux/util.c
+++ b/src/core/linux/util.c
@@ -36,7 +36,7 @@
 #include <config.h>
 #include <stdarg.h>
 #include <internals.h>
-#include <unistd.h>
+#include <lib3270/os.h>
 
 static char * concat(char *path, const char *name, size_t *length)
 {
diff --git a/src/core/telnet.c b/src/core/telnet.c
index 586cd0a..22f8362 100644
--- a/src/core/telnet.c
+++ b/src/core/telnet.c
@@ -73,7 +73,9 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#if !defined(_WIN32)
+#if defined(_WIN32)
+	#include <lib3270/win32.h>
+#else
 	#include <netdb.h>
 #endif
 
diff --git a/src/core/windows/connect.c b/src/core/windows/connect.c
index 934e61f..f13c8bd 100644
--- a/src/core/windows/connect.c
+++ b/src/core/windows/connect.c
@@ -32,6 +32,7 @@
 #include <winsock2.h>
 #include <windows.h>
 #include <ws2tcpip.h>
+#include <lib3270/win32.h>
 
 #include <internals.h>
 #include <lib3270/log.h>
diff --git a/src/core/windows/event_dispatcher.c b/src/core/windows/event_dispatcher.c
index 4e8c952..efd33e7 100644
--- a/src/core/windows/event_dispatcher.c
+++ b/src/core/windows/event_dispatcher.c
@@ -36,6 +36,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <lib3270/log.h>
+#include <lib3270/win32.h>
 
 #define TN	(timeout_t *)NULL
 
diff --git a/src/core/windows/http.c b/src/core/windows/http.c
index 9afb856..64b866d 100644
--- a/src/core/windows/http.c
+++ b/src/core/windows/http.c
@@ -42,6 +42,7 @@
 #include <lib3270/trace.h>
 #include <winhttp.h>
 #include <utilc.h>
+#include <lib3270/win32.h>
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
diff --git a/src/core/windows/util.c b/src/core/windows/util.c
index 5a6c649..72f1e15 100644
--- a/src/core/windows/util.c
+++ b/src/core/windows/util.c
@@ -49,6 +49,7 @@
 #endif // HAVE_ICONV
 
 #include <lib3270/log.h>
+#include <lib3270/win32.h>
 
 #define my_isspace(c)	isspace((unsigned char)c)
 
diff --git a/src/include/internals.h b/src/include/internals.h
index afa2dbc..aca5e9f 100644
--- a/src/include/internals.h
+++ b/src/include/internals.h
@@ -40,6 +40,7 @@
 #include <lib3270/actions.h>
 #include <lib3270/popup.h>
 #include <networking.h>
+#include <lib3270/os.h>
 
 #if defined(HAVE_LIBSSL)
 	#include <openssl/ssl.h>
@@ -100,7 +101,6 @@
 
 #else
 
-	#include <unistd.h>				/* Unix system calls */
 	#include <sys/time.h>			/* System time-related data types */
 
 #endif // _WIN32
diff --git a/src/include/lib3270.h b/src/include/lib3270.h
index cfde260..c8cd256 100644
--- a/src/include/lib3270.h
+++ b/src/include/lib3270.h
@@ -1573,32 +1573,6 @@
 
 	LIB3270_EXPORT int lib3270_set_as400(H3270 *hSession, int on);
 
-#ifdef _WIN32
-	LIB3270_EXPORT const char	* lib3270_win32_strerror(int e);
-	LIB3270_EXPORT const char	* lib3270_win32_local_charset(void);
-	LIB3270_EXPORT LSTATUS		  lib3270_win32_create_regkey(LPCSTR lpSubKey, REGSAM samDesired, PHKEY phkResult);
-	LIB3270_EXPORT DWORD		  lib3270_win32_get_dword(HKEY hKey, const char *name, DWORD def);
-
-	/**
-	 * @brief Translate windows error code.
-	 *
-	 * @param lasterror	Windows error code (from GetLastError()).
-	 *
-	 * @return String with translated message (release it with lib3270_free).
-	 *
-	 */
-	LIB3270_EXPORT char 		* lib3270_win32_translate_error_code(int lasterror);
-
-	/**
-	 * @brief Get lib3270's installation path.
-	 *
-	 * @return Full path for the lib3270 installation path (release it with lib3270_free)
-	 *
-	 */
-	 LIB3270_EXPORT char		* lib3270_get_installation_path();
-
-#endif // WIn32
-
 	/**
 	 * @brief Build filename on application data dir.
 	 *
diff --git a/src/include/lib3270/internals.h b/src/include/lib3270/internals.h
index 82bcd8f..5a5c1ef 100644
--- a/src/include/lib3270/internals.h
+++ b/src/include/lib3270/internals.h
@@ -44,5 +44,5 @@
 	}
 #endif
 
-#endif // LIB3270_HTML_H_INCLUDED
+#endif // LIB3270_INTERNALS_H_INCLUDED
 
diff --git a/src/include/linux/lib3270/os.h b/src/include/linux/lib3270/os.h
new file mode 100644
index 0000000..9616215
--- /dev/null
+++ b/src/include/linux/lib3270/os.h
@@ -0,0 +1,43 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como lib3270.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+ /**
+  * @brief TN3270 API linux definitions.
+  *
+  * @author perry.werneck@gmail.com
+  *
+  */
+
+#ifndef LIB3270_OS_H_INCLUDED
+
+	#define LIB3270_OS_H_INCLUDED 1
+
+	#include <unistd.h>
+
+#endif // LIB3270_OS_H_INCLUDED
diff --git a/src/include/macos/lib3270/os.h b/src/include/macos/lib3270/os.h
new file mode 100644
index 0000000..c9496e2
--- /dev/null
+++ b/src/include/macos/lib3270/os.h
@@ -0,0 +1,43 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como lib3270.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+ /**
+  * @brief TN3270 API MAC definitions.
+  *
+  * @author perry.werneck@gmail.com
+  *
+  */
+
+#ifndef LIB3270_OS_H_INCLUDED
+
+	#define LIB3270_OS_H_INCLUDED 1
+
+	#include <unistd.h>
+
+#endif // LIB3270_OS_H_INCLUDED
diff --git a/src/include/windows/lib3270/os.h b/src/include/windows/lib3270/os.h
new file mode 100644
index 0000000..c4237f3
--- /dev/null
+++ b/src/include/windows/lib3270/os.h
@@ -0,0 +1,44 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como lib3270.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+ /**
+  * @brief TN3270 API windows definitions.
+  *
+  * @author perry.werneck@gmail.com
+  *
+  */
+
+#ifndef LIB3270_OS_H_INCLUDED
+
+	#define LIB3270_OS_H_INCLUDED 1
+
+	#include <winsock2.h>
+	#include <windows.h>
+
+#endif // LIB3270_OS_H_INCLUDED
diff --git a/src/include/windows/lib3270/win32.h b/src/include/windows/lib3270/win32.h
new file mode 100644
index 0000000..5d61d6c
--- /dev/null
+++ b/src/include/windows/lib3270/win32.h
@@ -0,0 +1,78 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como lib3270.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+ /**
+  * @brief TN3270 API windows definitions.
+  *
+  * @author perry.werneck@gmail.com
+  *
+  */
+
+#ifndef LIB3270_WIN32_H_INCLUDED
+
+	#define LIB3270_WIN32_H_INCLUDED 1
+
+	#include <winsock2.h>
+	#include <windows.h>
+	#include <lib3270.h>
+
+#ifdef __cplusplus
+	extern "C" {
+#endif
+
+	LIB3270_EXPORT const char	* lib3270_win32_strerror(int e);
+	LIB3270_EXPORT const char	* lib3270_win32_local_charset(void);
+	LIB3270_EXPORT LSTATUS		  lib3270_win32_create_regkey(LPCSTR lpSubKey, REGSAM samDesired, PHKEY phkResult);
+	LIB3270_EXPORT DWORD		  lib3270_win32_get_dword(HKEY hKey, const char *name, DWORD def);
+
+	/**
+	 * @brief Translate windows error code.
+	 *
+	 * @param lasterror	Windows error code (from GetLastError()).
+	 *
+	 * @return String with translated message (release it with lib3270_free).
+	 *
+	 */
+	LIB3270_EXPORT char 		* lib3270_win32_translate_error_code(int lasterror);
+
+	/**
+	 * @brief Get lib3270's installation path.
+	 *
+	 * @return Full path for the lib3270 installation path (release it with lib3270_free)
+	 *
+	 */
+	 LIB3270_EXPORT char		* lib3270_get_installation_path();
+
+
+
+#ifdef __cplusplus
+	}
+#endif
+
+#endif // LIB3270_WIN32_H_INCLUDED
diff --git a/src/network_modules/openssl/context.c b/src/network_modules/openssl/context.c
index ae881d2..2a59928 100644
--- a/src/network_modules/openssl/context.c
+++ b/src/network_modules/openssl/context.c
@@ -39,6 +39,10 @@
 
 #include "private.h"
 
+#ifdef _WIN32
+	#include <lib3270/win32.h>
+#endif // _WIN32
+
 #include <openssl/err.h>
 #include <openssl/x509_vfy.h>
 
diff --git a/src/network_modules/openssl/private.h b/src/network_modules/openssl/private.h
index b6ce2b0..632569b 100644
--- a/src/network_modules/openssl/private.h
+++ b/src/network_modules/openssl/private.h
@@ -37,13 +37,13 @@
 		#include <winsock2.h>
 		#include <windows.h>
 	#else
-		#include <unistd.h>
 		#include <fcntl.h>
 	#endif // _WIN32
 
 	#include <lib3270.h>
  	#include <lib3270/log.h>
  	#include <lib3270/popup.h>
+	#include <lib3270/os.h>
  	#include <array.h>
  	#include <internals.h>
 	#include <networking.h>
diff --git a/src/network_modules/tools.c b/src/network_modules/tools.c
index 1a11ddd..d67d1c7 100644
--- a/src/network_modules/tools.c
+++ b/src/network_modules/tools.c
@@ -38,6 +38,9 @@
  #include <internals.h>
  #include <networking.h>
  #include <fcntl.h>
+ #ifdef _WIN32
+	#include <lib3270/win32.h>
+ #endif // _WIN32
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
diff --git a/src/ssl/notify.c b/src/ssl/notify.c
index 578c81b..0ba3706 100644
--- a/src/ssl/notify.c
+++ b/src/ssl/notify.c
@@ -37,6 +37,7 @@
 #include <internals.h>
 #include <lib3270/log.h>
 #include <lib3270/popup.h>
+#include <lib3270/win32.h>
 
 /*--[ Implement ]------------------------------------------------------------------------------------*/
 
diff --git a/src/testprogram/testprogram.c b/src/testprogram/testprogram.c
index b60837b..b552367 100644
--- a/src/testprogram/testprogram.c
+++ b/src/testprogram/testprogram.c
@@ -42,6 +42,10 @@
 #include <lib3270/properties.h>
 #include <lib3270/charset.h>
 
+#ifdef _WIN32
+	#include <lib3270/win32.h>
+#endif // _WIN32
+
 #define MAX_ARGS 10
 
 const char *trace_file = "test.trace";
--
libgit2 0.21.2