author | Tomas Klacko <tomas.klacko@oracle.com> |
Tue, 19 Jun 2012 02:04:06 -0700 | |
branch | s11-sru |
changeset 2292 | 7fe16a6a2bde |
parent 203 | 887f23af6934 |
permissions | -rw-r--r-- |
203
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
--- misc/unix/start.c.orig Fri Sep 19 11:41:54 2008 |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
+++ misc/unix/start.c Fri Sep 19 11:44:38 2008 |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
@@ -23,6 +23,9 @@ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
#include "apr_arch_internal_time.h" |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
+#if defined(SOLARIS2) && !defined(_LP64) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+#include <stdio_ext.h> |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
+#endif |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
const char * const * *argv, |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
@@ -47,6 +50,17 @@ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
return APR_SUCCESS; |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
} |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
|
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+#if defined(SOLARIS2) && !defined(_LP64) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
+ if (enable_extended_FILE_stdio (-1, -1) < 0) { |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
+ /* if the process has already enabled the extended file stdio |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+ * then, the above call will return an error. It should be |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ * ignored. |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+ */ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ if ((errno != EAGAIN) && (errno != EEXIST)) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
+ return APR_FROM_OS_ERROR(errno); |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
+ } |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
+#endif |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
+ |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
#if !defined(BEOS) && !defined(OS2) |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
apr_proc_mutex_unix_setup_lock(); |
887f23af6934
7035055 move apr and apr-util to userland
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
apr_unix_setup_time(); |