SQLite

Check-in [dfe510b510]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix shell compilation with MinGW by including the 'dirent.h' header.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: dfe510b51046a53c7f5c54fe73ec9de3364923eabd4b909c11984552e6bea406
User & Date: mistachkin 2018-01-05 20:08:46.463
Context
2018-01-05
20:13
Skip running the 'zipfile' test if the necessary static package cannot be loaded. (check-in: 5bc816ec40 user: mistachkin tags: trunk)
20:08
Fix shell compilation with MinGW by including the 'dirent.h' header. (check-in: dfe510b510 user: mistachkin tags: trunk)
19:49
Fix the autoconf makefile so that it builds testfixture correctly. (check-in: fbfe04c0b4 user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/shell.c.in.
︙︙
68
69
70
71
72
73
74


75




76
77
78
79
80
81
82

#include <stdarg.h>

#if !defined(_WIN32) && !defined(WIN32)
# include <signal.h>
# if !defined(__RTP__) && !defined(_WRS_KERNEL)
#  include <pwd.h>
# endif


# include <unistd.h>




#endif
#include <sys/types.h>
#include <sys/stat.h>

#if HAVE_READLINE
# include <readline/readline.h>
# include <readline/history.h>








>
>

>
>
>
>








68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88

#include <stdarg.h>

#if !defined(_WIN32) && !defined(WIN32)
# include <signal.h>
# if !defined(__RTP__) && !defined(_WRS_KERNEL)
#  include <pwd.h>
# endif
#endif
#if (!defined(_WIN32) && !defined(WIN32)) || defined(__MINGW_H)
# include <unistd.h>
# include <dirent.h>
# if defined(__MINGW_H)
#  define DIRENT dirent
# endif
#endif
#include <sys/types.h>
#include <sys/stat.h>

#if HAVE_READLINE
# include <readline/readline.h>
# include <readline/history.h>
︙︙
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888

** below by the ../tool/mkshellc.tcl script.  Before processing that included
** code, we need to override some macros to make the included program code
** work here in the middle of this regular program.
*/
#define SQLITE_EXTENSION_INIT1
#define SQLITE_EXTENSION_INIT2(X) (void)(X)

#if defined(_WIN32) || defined(WIN32)
INCLUDE test_windirent.c
#define dirent DIRENT
#define timespec TIMESPEC
#endif
INCLUDE ../ext/misc/shathree.c
INCLUDE ../ext/misc/fileio.c
INCLUDE ../ext/misc/completion.c
#ifdef SQLITE_HAVE_ZLIB
INCLUDE ../ext/misc/zipfile.c
INCLUDE ../ext/misc/sqlar.c








|


<








877
878
879
880
881
882
883
884
885
886

887
888
889
890
891
892
893

** below by the ../tool/mkshellc.tcl script.  Before processing that included
** code, we need to override some macros to make the included program code
** work here in the middle of this regular program.
*/
#define SQLITE_EXTENSION_INIT1
#define SQLITE_EXTENSION_INIT2(X) (void)(X)

#if defined(_WIN32) && defined(_MSC_VER)
INCLUDE test_windirent.c
#define dirent DIRENT

#endif
INCLUDE ../ext/misc/shathree.c
INCLUDE ../ext/misc/fileio.c
INCLUDE ../ext/misc/completion.c
#ifdef SQLITE_HAVE_ZLIB
INCLUDE ../ext/misc/zipfile.c
INCLUDE ../ext/misc/sqlar.c
︙︙