database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-06 15:49:35 +03:00
Code Activity

Use macro __DARWIN__ rather than __MACOS__ for conditional

Browse Source 
compilation of MacOSX specific features.  Ticket #2780. (CVS 4561)

FossilOrigin-Name: d0a4c2a36385c03dfadbb844823d0ed2458bf619
This commit is contained in:
drh
2007-11-26 22:54:27 +00:00
parent f998b730dd
commit 454ad58c3f
4 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/shell.c
View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases.
**
** $Id: shell.c,v 1.169 2007/11/12 21:09:11 chw Exp $
** $Id: shell.c,v 1.170 2007/11/26 22:54:27 drh Exp $
*/
#include <stdlib.h>
#include <string.h>
@@ -22,22 +22,13 @@
#include <ctype.h>
#include <stdarg.h>
#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) && !defined(__OS2__)
#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__)
# include <signal.h>
# include <pwd.h>
# include <unistd.h>
# include <sys/types.h>
#endif
#ifdef __MACOS__
# include <console.h>
# include <signal.h>
# include <unistd.h>
# include <extras.h>
# include <Files.h>
# include <Folders.h>
#endif
#ifdef __OS2__
# include <unistd.h>
#endif
@@ -1767,7 +1758,7 @@ static int process_input(struct callback_data *p, FILE *in){
static char *find_home_dir(void){
char *home_dir = NULL;
#if !defined(_WIN32) && !defined(WIN32) && !defined(__MACOS__) && !defined(__OS2__) && !defined(_WIN32_WCE)
#if !defined(_WIN32) && !defined(WIN32) && !defined(__OS2__) && !defined(_WIN32_WCE)
struct passwd *pwent;
uid_t uid = getuid();
if( (pwent=getpwuid(uid)) != NULL) {
@@ -1775,11 +1766,6 @@ static char *find_home_dir(void){
}
#endif
#ifdef __MACOS__
char home_path[_MAX_PATH+1];
home_dir = getcwd(home_path, _MAX_PATH);
#endif
#if defined(_WIN32_WCE)
/* Windows CE (arm-wince-mingw32ce-gcc) does not provide getenv()
*/
@@ -1919,10 +1905,6 @@ int main(int argc, char **argv){
int i;
int rc = 0;
#ifdef __MACOS__
argc = ccommand(&argv);
#endif
Argv0 = argv[0];
main_init(&data);
stdin_is_interactive = isatty(0);