Fossil SCM

Merge the windows build fix from trunk into the tooltips branch.

drh 2019-05-18 21:08 tooltips merge
Commit b406b41453b00f9729fbd3de60d8c0c389336fea75a2f00a6ecf892cb46ab635
Parent a27ca27f1de01da…
6 files changed -4 +2 -1 +2 -1 -2 -2 -2
~ src/makemake.tcl ~ src/timeline.c ~ src/timeline.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
-4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -825,12 +825,10 @@
825825
826826
 # With HTTPS support
827827
 ifdef FOSSIL_ENABLE_SSL
828828
 TCC += -DFOSSIL_ENABLE_SSL=1
829829
 RCC += -DFOSSIL_ENABLE_SSL=1
830
-TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
831
-RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
832830
 endif
833831
834832
 # With relative paths in external diff/gdiff
835833
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
836834
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
@@ -1707,12 +1705,10 @@
17071705
 !endif
17081706
17091707
 !if $(FOSSIL_ENABLE_SSL)!=0
17101708
 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
17111709
 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1712
-TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
1713
-RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
17141710
 LIBS = $(LIBS) $(SSLLIB)
17151711
 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
17161712
 !endif
17171713
17181714
 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
17191715
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -825,12 +825,10 @@
825
826 # With HTTPS support
827 ifdef FOSSIL_ENABLE_SSL
828 TCC += -DFOSSIL_ENABLE_SSL=1
829 RCC += -DFOSSIL_ENABLE_SSL=1
830 TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
831 RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
832 endif
833
834 # With relative paths in external diff/gdiff
835 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
836 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
@@ -1707,12 +1705,10 @@
1707 !endif
1708
1709 !if $(FOSSIL_ENABLE_SSL)!=0
1710 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1711 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
1712 TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
1713 RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
1714 LIBS = $(LIBS) $(SSLLIB)
1715 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1716 !endif
1717
1718 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
1719
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -825,12 +825,10 @@
825
826 # With HTTPS support
827 ifdef FOSSIL_ENABLE_SSL
828 TCC += -DFOSSIL_ENABLE_SSL=1
829 RCC += -DFOSSIL_ENABLE_SSL=1
 
 
830 endif
831
832 # With relative paths in external diff/gdiff
833 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
834 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
@@ -1707,12 +1705,10 @@
1705 !endif
1706
1707 !if $(FOSSIL_ENABLE_SSL)!=0
1708 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
1709 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
 
 
1710 LIBS = $(LIBS) $(SSLLIB)
1711 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
1712 !endif
1713
1714 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
1715
M src/timeline.c
+2 -1
--- src/timeline.c
+++ src/timeline.c
@@ -2009,12 +2009,13 @@
20092009
 zYearMonth = timeline_expand_datetime(zYearMonth);
20102010
 blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
20112011
 zYearMonth);
20122012
 }
20132013
 else if( zYearWeek ){
2014
+ char *z;
20142015
 zYearWeek = timeline_expand_datetime(zYearWeek);
2015
- char *z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
2016
+ z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
20162017
 if( z && z[0] ){
20172018
 zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
20182019
 zYearWeek);
20192020
 zYearWeek = z;
20202021
 }else{
20212022
--- src/timeline.c
+++ src/timeline.c
@@ -2009,12 +2009,13 @@
2009 zYearMonth = timeline_expand_datetime(zYearMonth);
2010 blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
2011 zYearMonth);
2012 }
2013 else if( zYearWeek ){
 
2014 zYearWeek = timeline_expand_datetime(zYearWeek);
2015 char *z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
2016 if( z && z[0] ){
2017 zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
2018 zYearWeek);
2019 zYearWeek = z;
2020 }else{
2021
--- src/timeline.c
+++ src/timeline.c
@@ -2009,12 +2009,13 @@
2009 zYearMonth = timeline_expand_datetime(zYearMonth);
2010 blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
2011 zYearMonth);
2012 }
2013 else if( zYearWeek ){
2014 char *z;
2015 zYearWeek = timeline_expand_datetime(zYearWeek);
2016 z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
2017 if( z && z[0] ){
2018 zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
2019 zYearWeek);
2020 zYearWeek = z;
2021 }else{
2022
M src/timeline.c
+2 -1
--- src/timeline.c
+++ src/timeline.c
@@ -2009,12 +2009,13 @@
20092009
 zYearMonth = timeline_expand_datetime(zYearMonth);
20102010
 blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
20112011
 zYearMonth);
20122012
 }
20132013
 else if( zYearWeek ){
2014
+ char *z;
20142015
 zYearWeek = timeline_expand_datetime(zYearWeek);
2015
- char *z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
2016
+ z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
20162017
 if( z && z[0] ){
20172018
 zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
20182019
 zYearWeek);
20192020
 zYearWeek = z;
20202021
 }else{
20212022
--- src/timeline.c
+++ src/timeline.c
@@ -2009,12 +2009,13 @@
2009 zYearMonth = timeline_expand_datetime(zYearMonth);
2010 blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
2011 zYearMonth);
2012 }
2013 else if( zYearWeek ){
 
2014 zYearWeek = timeline_expand_datetime(zYearWeek);
2015 char *z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
2016 if( z && z[0] ){
2017 zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
2018 zYearWeek);
2019 zYearWeek = z;
2020 }else{
2021
--- src/timeline.c
+++ src/timeline.c
@@ -2009,12 +2009,13 @@
2009 zYearMonth = timeline_expand_datetime(zYearMonth);
2010 blob_append_sql(&cond, " AND %Q=strftime('%%Y-%%m',event.mtime) ",
2011 zYearMonth);
2012 }
2013 else if( zYearWeek ){
2014 char *z;
2015 zYearWeek = timeline_expand_datetime(zYearWeek);
2016 z = db_text(0, "SELECT strftime('%%Y-%%W',%Q)", zYearWeek);
2017 if( z && z[0] ){
2018 zYearWeekStart = db_text(0, "SELECT date(%Q,'-6 days','weekday 1')",
2019 zYearWeek);
2020 zYearWeek = z;
2021 }else{
2022
M win/Makefile.mingw
-2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -288,12 +288,10 @@
288288
289289
 # With HTTPS support
290290
 ifdef FOSSIL_ENABLE_SSL
291291
 TCC += -DFOSSIL_ENABLE_SSL=1
292292
 RCC += -DFOSSIL_ENABLE_SSL=1
293
-TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294
-RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
295293
 endif
296294
297295
 # With relative paths in external diff/gdiff
298296
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
299297
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
300298
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -288,12 +288,10 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
293 TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294 RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
295 endif
296
297 # With relative paths in external diff/gdiff
298 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
299 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
300
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -288,12 +288,10 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
 
 
293 endif
294
295 # With relative paths in external diff/gdiff
296 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298
M win/Makefile.mingw.mistachkin
-2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -288,12 +288,10 @@
288288
289289
 # With HTTPS support
290290
 ifdef FOSSIL_ENABLE_SSL
291291
 TCC += -DFOSSIL_ENABLE_SSL=1
292292
 RCC += -DFOSSIL_ENABLE_SSL=1
293
-TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294
-RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
295293
 endif
296294
297295
 # With relative paths in external diff/gdiff
298296
 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
299297
 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
300298
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -288,12 +288,10 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
293 TCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
294 RCC += -DHAVE_BIO_ADDR_HOSTNAME_STRING=1
295 endif
296
297 # With relative paths in external diff/gdiff
298 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
299 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
300
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -288,12 +288,10 @@
288
289 # With HTTPS support
290 ifdef FOSSIL_ENABLE_SSL
291 TCC += -DFOSSIL_ENABLE_SSL=1
292 RCC += -DFOSSIL_ENABLE_SSL=1
 
 
293 endif
294
295 # With relative paths in external diff/gdiff
296 ifdef FOSSIL_ENABLE_EXEC_REL_PATHS
297 TCC += -DFOSSIL_ENABLE_EXEC_REL_PATHS=1
298
M win/Makefile.msc
-2
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -235,12 +235,10 @@
235235
 !endif
236236
237237
 !if $(FOSSIL_ENABLE_SSL)!=0
238238
 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
239239
 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
240
-TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
241
-RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
242240
 LIBS = $(LIBS) $(SSLLIB)
243241
 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
244242
 !endif
245243
246244
 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
247245
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -235,12 +235,10 @@
235 !endif
236
237 !if $(FOSSIL_ENABLE_SSL)!=0
238 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
239 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
240 TCC = $(TCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
241 RCC = $(RCC) /DHAVE_BIO_ADDR_HOSTNAME_STRING=1
242 LIBS = $(LIBS) $(SSLLIB)
243 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
244 !endif
245
246 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
247
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -235,12 +235,10 @@
235 !endif
236
237 !if $(FOSSIL_ENABLE_SSL)!=0
238 TCC = $(TCC) /DFOSSIL_ENABLE_SSL=1
239 RCC = $(RCC) /DFOSSIL_ENABLE_SSL=1
 
 
240 LIBS = $(LIBS) $(SSLLIB)
241 LIBDIR = $(LIBDIR) /LIBPATH:$(SSLLIBDIR)
242 !endif
243
244 !if $(FOSSIL_ENABLE_EXEC_REL_PATHS)!=0
245

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button