allow nc to build on linux and os x

author: Brent Cook <bcook@openbsd.org> 2015-09-13 11:56:41 -0500
committer: Brent Cook <bcook@openbsd.org> 2015-09-13 18:42:15 -0500
commit: 8c90be2a29053ac613dfe0c11a423da16c7c4520 (patch)
tree: cf31a8e35cd9793f5f6f622b0ffcce61bbad8652 /include/compat
parent: 627b0261a81bb18ef95156baa37101ddcb14e356 (diff)
download: portable-8c90be2a29053ac613dfe0c11a423da16c7c4520.tar.gz
portable-8c90be2a29053ac613dfe0c11a423da16c7c4520.tar.bz2
portable-8c90be2a29053ac613dfe0c11a423da16c7c4520.zip
3 files changed, 91 insertions, 10 deletions
diff --git a/include/compat/netinet/ip.h b/include/compat/netinet/ip.h
new file mode 100644
index 0000000..405bbcf
--- /dev/null
+++ b/include/compat/netinet/ip.h
@@ -0,0 +1,43 @@
+/*
+ * Public domain
+ * netinet/ip.h compatibility shim
+ */
+#ifndef _WIN32
+#include_next <netinet/ip.h>
+#else
+#include <win32netcompat.h>
+#endif
+/*
+ * Definitions for DiffServ Codepoints as per RFC2474
+ */
+#ifndef IPTOS_DSCP_CS0
+#define IPTOS_DSCP_CS0          0x00
+#define IPTOS_DSCP_CS1          0x20
+#define IPTOS_DSCP_CS2          0x40
+#define IPTOS_DSCP_CS3          0x60
+#define IPTOS_DSCP_CS4          0x80
+#define IPTOS_DSCP_CS5          0xa0
+#define IPTOS_DSCP_CS6          0xc0
+#define IPTOS_DSCP_CS7          0xe0
+#endif
+#ifndef IPTOS_DSCP_AF11
+#define IPTOS_DSCP_AF11         0x28
+#define IPTOS_DSCP_AF12         0x30
+#define IPTOS_DSCP_AF13         0x38
+#define IPTOS_DSCP_AF21         0x48
+#define IPTOS_DSCP_AF22         0x50
+#define IPTOS_DSCP_AF23         0x58
+#define IPTOS_DSCP_AF31         0x68
+#define IPTOS_DSCP_AF32         0x70
+#define IPTOS_DSCP_AF33         0x78
+#define IPTOS_DSCP_AF41         0x88
+#define IPTOS_DSCP_AF42         0x90
+#define IPTOS_DSCP_AF43         0x98
+#endif
+#ifndef IPTOS_DSCP_EF
+#define IPTOS_DSCP_EF           0xb8
+#endif
diff --git a/include/compat/readpassphrase.h b/include/compat/readpassphrase.h
new file mode 100644
index 0000000..aedf16c
--- /dev/null
+++ b/include/compat/readpassphrase.h
@@ -0,0 +1,48 @@
+/*      $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $      */
+/*
+ * Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Sponsored in part by the Defense Advanced Research Projects
+ * Agency (DARPA) and Air Force Research Laboratory, Air Force
+ * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+ */
+#ifdef HAVE_READPASSPHRASE_H
+#include_next <readpassphrase.h>
+#else
+#ifndef _READPASSPHRASE_H_
+#define _READPASSPHRASE_H_
+#define RPP_ECHO_OFF    0x00            /* Turn off echo (default). */
+#define RPP_ECHO_ON     0x01            /* Leave echo on. */
+#define RPP_REQUIRE_TTY 0x02            /* Fail if there is no tty. */
+#define RPP_FORCELOWER  0x04            /* Force input to lower case. */
+#define RPP_FORCEUPPER  0x08            /* Force input to upper case. */
+#define RPP_SEVENBIT    0x10            /* Strip the high bit from input. */
+#define RPP_STDIN       0x20            /* Read from stdin, not /dev/tty */
+#include <sys/cdefs.h>
+__BEGIN_DECLS
+char * readpassphrase(const char *, char *, size_t, int);
+__END_DECLS
+#endif /* !_READPASSPHRASE_H_ */
+#endif
diff --git a/include/compat/sys/socket.h b/include/compat/sys/socket.h
deleted file mode 100644
index 17e84f1..0000000
--- a/include/compat/sys/socket.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Public domain
- * sys/socket.h compatibility shim
- */
-#ifndef _WIN32
-#include_next <sys/socket.h>
-#else
-#include <win32netcompat.h>
-#endif
author	Brent Cook <bcook@openbsd.org>	2015-09-13 11:56:41 -0500
committer	Brent Cook <bcook@openbsd.org>	2015-09-13 18:42:15 -0500
commit	8c90be2a29053ac613dfe0c11a423da16c7c4520 (patch)
tree	cf31a8e35cd9793f5f6f622b0ffcce61bbad8652 /include/compat
parent	627b0261a81bb18ef95156baa37101ddcb14e356 (diff)
download	portable-8c90be2a29053ac613dfe0c11a423da16c7c4520.tar.gz portable-8c90be2a29053ac613dfe0c11a423da16c7c4520.tar.bz2 portable-8c90be2a29053ac613dfe0c11a423da16c7c4520.zip

diff --git a/include/compat/netinet/ip.h b/include/compat/netinet/ip.h new file mode 100644 index 0000000..405bbcf --- /dev/null +++ b/include/compat/netinet/ip.h
@@ -0,0 +1,43 @@
		1	/*
		2	* Public domain
		3	* netinet/ip.h compatibility shim
		4	*/
		5
		6	#ifndef _WIN32
		7	#include_next <netinet/ip.h>
		8	#else
		9	#include <win32netcompat.h>
		10	#endif
		11
		12	/*
		13	* Definitions for DiffServ Codepoints as per RFC2474
		14	*/
		15	#ifndef IPTOS_DSCP_CS0
		16	#define IPTOS_DSCP_CS0 0x00
		17	#define IPTOS_DSCP_CS1 0x20
		18	#define IPTOS_DSCP_CS2 0x40
		19	#define IPTOS_DSCP_CS3 0x60
		20	#define IPTOS_DSCP_CS4 0x80
		21	#define IPTOS_DSCP_CS5 0xa0
		22	#define IPTOS_DSCP_CS6 0xc0
		23	#define IPTOS_DSCP_CS7 0xe0
		24	#endif
		25
		26	#ifndef IPTOS_DSCP_AF11
		27	#define IPTOS_DSCP_AF11 0x28
		28	#define IPTOS_DSCP_AF12 0x30
		29	#define IPTOS_DSCP_AF13 0x38
		30	#define IPTOS_DSCP_AF21 0x48
		31	#define IPTOS_DSCP_AF22 0x50
		32	#define IPTOS_DSCP_AF23 0x58
		33	#define IPTOS_DSCP_AF31 0x68
		34	#define IPTOS_DSCP_AF32 0x70
		35	#define IPTOS_DSCP_AF33 0x78
		36	#define IPTOS_DSCP_AF41 0x88
		37	#define IPTOS_DSCP_AF42 0x90
		38	#define IPTOS_DSCP_AF43 0x98
		39	#endif
		40
		41	#ifndef IPTOS_DSCP_EF
		42	#define IPTOS_DSCP_EF 0xb8
		43	#endif


diff --git a/include/compat/readpassphrase.h b/include/compat/readpassphrase.h new file mode 100644 index 0000000..aedf16c --- /dev/null +++ b/include/compat/readpassphrase.h
@@ -0,0 +1,48 @@
		1	/* $OpenBSD: readpassphrase.h,v 1.5 2003/06/17 21:56:23 millert Exp $ */
		2
		3	/*
		4	* Copyright (c) 2000, 2002 Todd C. Miller <Todd.Miller@courtesan.com>
		5	*
		6	* Permission to use, copy, modify, and distribute this software for any
		7	* purpose with or without fee is hereby granted, provided that the above
		8	* copyright notice and this permission notice appear in all copies.
		9	*
		10	* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
		11	* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
		12	* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
		13	* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
		14	* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
		15	* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
		16	* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
		17	*
		18	* Sponsored in part by the Defense Advanced Research Projects
		19	* Agency (DARPA) and Air Force Research Laboratory, Air Force
		20	* Materiel Command, USAF, under agreement number F39502-99-1-0512.
		21	*/
		22
		23	#ifdef HAVE_READPASSPHRASE_H
		24
		25	#include_next <readpassphrase.h>
		26
		27	#else
		28
		29	#ifndef _READPASSPHRASE_H_
		30	#define _READPASSPHRASE_H_
		31
		32	#define RPP_ECHO_OFF 0x00 /* Turn off echo (default). */
		33	#define RPP_ECHO_ON 0x01 /* Leave echo on. */
		34	#define RPP_REQUIRE_TTY 0x02 /* Fail if there is no tty. */
		35	#define RPP_FORCELOWER 0x04 /* Force input to lower case. */
		36	#define RPP_FORCEUPPER 0x08 /* Force input to upper case. */
		37	#define RPP_SEVENBIT 0x10 /* Strip the high bit from input. */
		38	#define RPP_STDIN 0x20 /* Read from stdin, not /dev/tty */
		39
		40	#include <sys/cdefs.h>
		41
		42	__BEGIN_DECLS
		43	char * readpassphrase(const char , char , size_t, int);
		44	__END_DECLS
		45
		46	#endif /* !_READPASSPHRASE_H_ */
		47
		48	#endif


diff --git a/include/compat/sys/socket.h b/include/compat/sys/socket.h deleted file mode 100644 index 17e84f1..0000000 --- a/include/compat/sys/socket.h +++ /dev/null
@@ -1,10 +0,0 @@
1	/*
2	* Public domain
3	* sys/socket.h compatibility shim
4	*/
5
6	#ifndef _WIN32
7	#include_next <sys/socket.h>
8	#else
9	#include <win32netcompat.h>
10	#endif