summaryrefslogtreecommitdiff
path: root/perl.h
diff options
context:
space:
mode:
authorNick Ing-Simmons <nik@tiuk.ti.com>2001-12-27 11:11:51 +0000
committerNick Ing-Simmons <nik@tiuk.ti.com>2001-12-27 11:11:51 +0000
commitc647d955ec5be212cbda9695b83885c68fc47cff (patch)
tree275e3b0e7ea6a0cd9cb7edbbd4bc3ab69f34a17f /perl.h
parent3da9a137807e4f1acaf9cb3024a6cc5fbd119b9f (diff)
parent3853ea39bf7dbf26f8bbd5b11cd6ca8f77b7a6b7 (diff)
downloadperl-c647d955ec5be212cbda9695b83885c68fc47cff.tar.gz
Integrate mainline
p4raw-id: //depot/perlio@13900
Diffstat (limited to 'perl.h')
-rw-r--r--perl.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/perl.h b/perl.h
index 47ebb09713..503ab05923 100644
--- a/perl.h
+++ b/perl.h
@@ -755,6 +755,12 @@ int sockatmark(int);
# endif
#endif
+#ifndef HAS_SOCKETPAIR
+# ifdef HAS_SOCKET
+# define socketpair Perl_my_socketpair
+# endif
+#endif
+
#if INTSIZE == 2
# define htoni htons
# define ntohi ntohs
@@ -3937,12 +3943,13 @@ int flock(int fd, int op);
#if O_TEXT != O_BINARY
/* If you have different O_TEXT and O_BINARY and you are a CLRF shop,
* that is, you are somehow DOSish. */
-# if !defined(__BEOS__)
-# define PERLIO_USING_CRLF 1
-# else
+# if defined(__BEOS__)
/* If you have O_TEXT different from your O_BINARY but you still are
* not a CRLF shop. */
# undef PERLIO_USING_CRLF
+# else
+ /* If you really are DOSish. */
+# define PERLIO_USING_CRLF 1
# endif
#endif