| OLD | NEW |
| 1 diff --git a/shell.c b/shell.c | 1 diff --git a/shell.c b/shell.c |
| 2 --- a/shell.c | 2 --- a/shell.c |
| 3 +++ b/shell.c | 3 +++ b/shell.c |
| 4 @@ -2935,6 +2939,10 @@ static char *cmdline_option_value(int argc, char **argv,
int i){ | |
| 5 return argv[i]; | |
| 6 } | |
| 7 | |
| 8 +#ifdef PPAPI | |
| 9 +#define main nacl_main | |
| 10 +#endif | |
| 11 + | |
| 12 int main(int argc, char **argv){ | |
| 13 char *zErrMsg = 0; | |
| 14 struct callback_data data; | |
| 15 @@ -2952,6 +2968,10 @@ int main(int argc, char **argv){ | 4 @@ -2952,6 +2968,10 @@ int main(int argc, char **argv){ |
| 16 main_init(&data); | 5 main_init(&data); |
| 17 stdin_is_interactive = isatty(0); | 6 stdin_is_interactive = isatty(0); |
| 18 | 7 |
| 19 +#if defined __native_client__ && !defined PPAPI | 8 +#if defined __native_client__ && !defined PPAPI |
| 20 + stdin_is_interactive = 1; | 9 + stdin_is_interactive = 1; |
| 21 +#endif | 10 +#endif |
| 22 + | 11 + |
| 23 /* Make sure we have a valid signal handler early, before anything | 12 /* Make sure we have a valid signal handler early, before anything |
| 24 ** else is done. | 13 ** else is done. |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 */ | 48 */ |
| 60 static sqlite3_vfs aVfs[] = { | 49 static sqlite3_vfs aVfs[] = { |
| 61 +#if defined __native_client__ | 50 +#if defined __native_client__ |
| 62 + // Give higher priority to "unix-dotfile" over "unix", because NaCl doesn't | 51 + // Give higher priority to "unix-dotfile" over "unix", because NaCl doesn't |
| 63 + // support some POSIX fcntl operations (F_GETLK, F_SETLK). | 52 + // support some POSIX fcntl operations (F_GETLK, F_SETLK). |
| 64 + UNIXVFS("unix-dotfile", dotlockIoFinder ), | 53 + UNIXVFS("unix-dotfile", dotlockIoFinder ), |
| 65 +#endif | 54 +#endif |
| 66 #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) | 55 #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) |
| 67 UNIXVFS("unix", autolockIoFinder ), | 56 UNIXVFS("unix", autolockIoFinder ), |
| 68 #else | 57 #else |
| OLD | NEW |