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 Kristina Tripp <Kristina.Tripp@oracle.com>
Thu, 09 Oct 2014 15:53:40 -0700
branchs11-update
changeset 3378 8c7eb3630145
parent 115 c360825c3a3f
child 5518 c47fe0edc204
permissions -rw-r--r--
PSARC/2014/275 Hiera 1.3.4 19137944 Add hiera to userland consolidation 19623766 hiera-19 package not installed if ruby-19 not installed
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