Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/bash/patches/solaris-011.input_avail.c.patch
author Petr Nyc <Petr.Nyc@Oracle.COM>
Tue, 08 Sep 2015 10:40:03 -0700
branchs11u3-sru
changeset 4842 3661acf9f226
parent 115 c360825c3a3f
child 5518 c47fe0edc204
permissions -rw-r--r--
21697353 Userland needs SRU branch for 11.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
110
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     1
 
--- lib/sh/input_avail.c	2009-04-19 10:01:14.000000000 -0700
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     2
 
+++ lib/sh/input_avail.c	2010-09-01 10:47:30.418016819 -0700
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     3
 
@@ -45,6 +45,10 @@
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     4
 
 #  include <sys/ioctl.h>
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     5
 
 #endif
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     6
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     7
 
+#if defined(SOLARIS)
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
+#  include <sys/filio.h> /* Solaris FIONREAD */
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
 
+#endif
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
+
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
 #include <stdio.h>
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
 #include <errno.h>
77641682ba6f 7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
upstream/oracle/userland-gate