Fossil SCM
Fix compilation with Makefile.msc (and Makefile.mingw.mistachkin). Thanks to Ryan Noll for reporting this.
Commit
af995cf7ea6b0e9422b6529125f4548be10a2a22
Parent
190353e90dee70f…
2 files changed
+2
+1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -1710,10 +1710,12 @@ | ||
| 1710 | 1710 | -DSQLITE_USE_MALLOC_H \ |
| 1711 | 1711 | -DSQLITE_USE_MSIZE |
| 1712 | 1712 | |
| 1713 | 1713 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 1714 | 1714 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1715 | + -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ | |
| 1716 | + -DSQLITE_SHELL_DBNAME_PROC=fossil_open \ | |
| 1715 | 1717 | -Dgetenv=fossil_getenv \ |
| 1716 | 1718 | -Dfopen=fossil_fopen |
| 1717 | 1719 | |
| 1718 | 1720 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c $(SRCDIR)/../win/Makefile.mingw.mistachkin |
| 1719 | 1721 | $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1720 | 1722 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1710,10 +1710,12 @@ | |
| 1710 | -DSQLITE_USE_MALLOC_H \ |
| 1711 | -DSQLITE_USE_MSIZE |
| 1712 | |
| 1713 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 1714 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1715 | -Dgetenv=fossil_getenv \ |
| 1716 | -Dfopen=fossil_fopen |
| 1717 | |
| 1718 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c $(SRCDIR)/../win/Makefile.mingw.mistachkin |
| 1719 | $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1720 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -1710,10 +1710,12 @@ | |
| 1710 | -DSQLITE_USE_MALLOC_H \ |
| 1711 | -DSQLITE_USE_MSIZE |
| 1712 | |
| 1713 | SHELL_OPTIONS = -Dmain=sqlite3_shell \ |
| 1714 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 1715 | -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \ |
| 1716 | -DSQLITE_SHELL_DBNAME_PROC=fossil_open \ |
| 1717 | -Dgetenv=fossil_getenv \ |
| 1718 | -Dfopen=fossil_fopen |
| 1719 | |
| 1720 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c $(SRCDIR)/../win/Makefile.mingw.mistachkin |
| 1721 | $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o |
| 1722 |
+1
| --- win/include/dirent.h | ||
| +++ win/include/dirent.h | ||
| @@ -189,10 +189,11 @@ | ||
| 189 | 189 | #define DT_DIR S_IFDIR |
| 190 | 190 | #define DT_FIFO S_IFIFO |
| 191 | 191 | #define DT_SOCK S_IFSOCK |
| 192 | 192 | #define DT_CHR S_IFCHR |
| 193 | 193 | #define DT_BLK S_IFBLK |
| 194 | +#define DT_LNK S_IFLNK | |
| 194 | 195 | |
| 195 | 196 | /* Macros for converting between st_mode and d_type */ |
| 196 | 197 | #define IFTODT(mode) ((mode) & S_IFMT) |
| 197 | 198 | #define DTTOIF(type) (type) |
| 198 | 199 | |
| 199 | 200 |
| --- win/include/dirent.h | |
| +++ win/include/dirent.h | |
| @@ -189,10 +189,11 @@ | |
| 189 | #define DT_DIR S_IFDIR |
| 190 | #define DT_FIFO S_IFIFO |
| 191 | #define DT_SOCK S_IFSOCK |
| 192 | #define DT_CHR S_IFCHR |
| 193 | #define DT_BLK S_IFBLK |
| 194 | |
| 195 | /* Macros for converting between st_mode and d_type */ |
| 196 | #define IFTODT(mode) ((mode) & S_IFMT) |
| 197 | #define DTTOIF(type) (type) |
| 198 | |
| 199 |
| --- win/include/dirent.h | |
| +++ win/include/dirent.h | |
| @@ -189,10 +189,11 @@ | |
| 189 | #define DT_DIR S_IFDIR |
| 190 | #define DT_FIFO S_IFIFO |
| 191 | #define DT_SOCK S_IFSOCK |
| 192 | #define DT_CHR S_IFCHR |
| 193 | #define DT_BLK S_IFBLK |
| 194 | #define DT_LNK S_IFLNK |
| 195 | |
| 196 | /* Macros for converting between st_mode and d_type */ |
| 197 | #define IFTODT(mode) ((mode) & S_IFMT) |
| 198 | #define DTTOIF(type) (type) |
| 199 | |
| 200 |