Fossil SCM

minor hack to allow libcson to use fossil_malloc/free/realloc() so that we will hook into its die-on-OOM behaviour (=reduced error checking).

stephan 2011-10-08 05:16 json-multitag-test
Commit 56ecc0c67731347f3d9df4a70f707a105f730784
Parent a37df1d939fc155…
4 files changed +34 -3 +5 -2 +7 -3 +1 -1
~ src/cson_amalgamation.c ~ src/main.mk ~ src/makemake.tcl ~ win/Makefile.mingw
M src/cson_amalgamation.c
+34 -3
--- src/cson_amalgamation.c
+++ src/cson_amalgamation.c
@@ -1723,10 +1723,38 @@
17231723
 If CSON_LOG_ALLOC is true then the cson_malloc/realloc/free() routines
17241724
 will log a message to stderr.
17251725
 */
17261726
 #define CSON_LOG_ALLOC 0
17271727
1728
+
1729
+/**
1730
+ CSON_FOSSIL_MODE is only for use in the Fossil
1731
+ source tree, so that we can plug in to its allocators.
1732
+ We can't do this by, e.g., defining macros for the
1733
+ malloc/free funcs because fossil's lack of header files
1734
+ means we would have to #include "main.c" here to
1735
+ get the declarations.
1736
+ */
1737
+#if defined(CSON_FOSSIL_MODE)
1738
+void *fossil_malloc(size_t n);
1739
+void fossil_free(void *p);
1740
+void *fossil_realloc(void *p, size_t n);
1741
+# define CSON_MALLOC_IMPL fossil_malloc
1742
+# define CSON_FREE_IMPL fossil_free
1743
+# define CSON_REALLOC_IMPL fossil_realloc
1744
+#endif
1745
+
1746
+#if !defined CSON_MALLOC_IMPL
1747
+# define CSON_MALLOC_IMPL malloc
1748
+#endif
1749
+#if !defined CSON_FREE_IMPL
1750
+# define CSON_FREE_IMPL free
1751
+#endif
1752
+#if !defined CSON_REALLOC_IMPL
1753
+# define CSON_REALLOC_IMPL realloc
1754
+#endif
1755
+
17281756
 /**
17291757
 A test/debug macro for simulating an OOM after the given number of
17301758
 bytes have been allocated.
17311759
 */
17321760
 #define CSON_SIMULATE_OOM 0
@@ -1745,11 +1773,11 @@
17451773
 if( cson_totalAlloced > CSON_SIMULATE_OOM )
17461774
 {
17471775
 return NULL;
17481776
 }
17491777
 #endif
1750
- return malloc(n);
1778
+ return CSON_MALLOC_IMPL(n);
17511779
 }
17521780
17531781
 /** Simple proxy for free(). descr is a description of the memory being freed. */
17541782
 static void cson_free( void * p, char const * descr )
17551783
 {
@@ -1756,11 +1784,11 @@
17561784
 #if CSON_LOG_ALLOC
17571785
 fprintf(stderr, "Freeing @%p [%s].\n", p, descr);
17581786
 #endif
17591787
 if( !cson_value_is_builtin(p) )
17601788
 {
1761
- free( p );
1789
+ CSON_FREE_IMPL( p );
17621790
 }
17631791
 }
17641792
 /** Simple proxy for realloc(). descr is a description of the (re)allocation. */
17651793
 static void * cson_realloc( void * hint, size_t n, char const * descr )
17661794
 {
@@ -1781,11 +1809,11 @@
17811809
 cson_free(hint, descr);
17821810
 return NULL;
17831811
 }
17841812
 else
17851813
 {
1786
- return realloc( hint, n );
1814
+ return CSON_REALLOC_IMPL( hint, n );
17871815
 }
17881816
 }
17891817
17901818
17911819
 #undef CSON_LOG_ALLOC
@@ -4876,10 +4904,13 @@
48764904
 #undef CSON_DBL
48774905
 #undef CSON_STR
48784906
 #undef CSON_OBJ
48794907
 #undef CSON_ARRAY
48804908
 #undef CSON_VCAST
4909
+#undef CSON_MALLOC_IMPL
4910
+#undef CSON_FREE_IMPL
4911
+#undef CSON_REALLOC_IMPL
48814912
 /* end file ./cson.c */
48824913
 /* begin file ./cson_lists.h */
48834914
 /* Auto-generated from cson_list.h. Edit at your own risk! */
48844915
 unsigned int cson_value_list_reserve( cson_value_list * self, unsigned int n )
48854916
 {
48864917
--- src/cson_amalgamation.c
+++ src/cson_amalgamation.c
@@ -1723,10 +1723,38 @@
1723 If CSON_LOG_ALLOC is true then the cson_malloc/realloc/free() routines
1724 will log a message to stderr.
1725 */
1726 #define CSON_LOG_ALLOC 0
1727
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1728 /**
1729 A test/debug macro for simulating an OOM after the given number of
1730 bytes have been allocated.
1731 */
1732 #define CSON_SIMULATE_OOM 0
@@ -1745,11 +1773,11 @@
1745 if( cson_totalAlloced > CSON_SIMULATE_OOM )
1746 {
1747 return NULL;
1748 }
1749 #endif
1750 return malloc(n);
1751 }
1752
1753 /** Simple proxy for free(). descr is a description of the memory being freed. */
1754 static void cson_free( void * p, char const * descr )
1755 {
@@ -1756,11 +1784,11 @@
1756 #if CSON_LOG_ALLOC
1757 fprintf(stderr, "Freeing @%p [%s].\n", p, descr);
1758 #endif
1759 if( !cson_value_is_builtin(p) )
1760 {
1761 free( p );
1762 }
1763 }
1764 /** Simple proxy for realloc(). descr is a description of the (re)allocation. */
1765 static void * cson_realloc( void * hint, size_t n, char const * descr )
1766 {
@@ -1781,11 +1809,11 @@
1781 cson_free(hint, descr);
1782 return NULL;
1783 }
1784 else
1785 {
1786 return realloc( hint, n );
1787 }
1788 }
1789
1790
1791 #undef CSON_LOG_ALLOC
@@ -4876,10 +4904,13 @@
4876 #undef CSON_DBL
4877 #undef CSON_STR
4878 #undef CSON_OBJ
4879 #undef CSON_ARRAY
4880 #undef CSON_VCAST
 
 
 
4881 /* end file ./cson.c */
4882 /* begin file ./cson_lists.h */
4883 /* Auto-generated from cson_list.h. Edit at your own risk! */
4884 unsigned int cson_value_list_reserve( cson_value_list * self, unsigned int n )
4885 {
4886
--- src/cson_amalgamation.c
+++ src/cson_amalgamation.c
@@ -1723,10 +1723,38 @@
1723 If CSON_LOG_ALLOC is true then the cson_malloc/realloc/free() routines
1724 will log a message to stderr.
1725 */
1726 #define CSON_LOG_ALLOC 0
1727
1728
1729 /**
1730 CSON_FOSSIL_MODE is only for use in the Fossil
1731 source tree, so that we can plug in to its allocators.
1732 We can't do this by, e.g., defining macros for the
1733 malloc/free funcs because fossil's lack of header files
1734 means we would have to #include "main.c" here to
1735 get the declarations.
1736 */
1737 #if defined(CSON_FOSSIL_MODE)
1738 void *fossil_malloc(size_t n);
1739 void fossil_free(void *p);
1740 void *fossil_realloc(void *p, size_t n);
1741 # define CSON_MALLOC_IMPL fossil_malloc
1742 # define CSON_FREE_IMPL fossil_free
1743 # define CSON_REALLOC_IMPL fossil_realloc
1744 #endif
1745
1746 #if !defined CSON_MALLOC_IMPL
1747 # define CSON_MALLOC_IMPL malloc
1748 #endif
1749 #if !defined CSON_FREE_IMPL
1750 # define CSON_FREE_IMPL free
1751 #endif
1752 #if !defined CSON_REALLOC_IMPL
1753 # define CSON_REALLOC_IMPL realloc
1754 #endif
1755
1756 /**
1757 A test/debug macro for simulating an OOM after the given number of
1758 bytes have been allocated.
1759 */
1760 #define CSON_SIMULATE_OOM 0
@@ -1745,11 +1773,11 @@
1773 if( cson_totalAlloced > CSON_SIMULATE_OOM )
1774 {
1775 return NULL;
1776 }
1777 #endif
1778 return CSON_MALLOC_IMPL(n);
1779 }
1780
1781 /** Simple proxy for free(). descr is a description of the memory being freed. */
1782 static void cson_free( void * p, char const * descr )
1783 {
@@ -1756,11 +1784,11 @@
1784 #if CSON_LOG_ALLOC
1785 fprintf(stderr, "Freeing @%p [%s].\n", p, descr);
1786 #endif
1787 if( !cson_value_is_builtin(p) )
1788 {
1789 CSON_FREE_IMPL( p );
1790 }
1791 }
1792 /** Simple proxy for realloc(). descr is a description of the (re)allocation. */
1793 static void * cson_realloc( void * hint, size_t n, char const * descr )
1794 {
@@ -1781,11 +1809,11 @@
1809 cson_free(hint, descr);
1810 return NULL;
1811 }
1812 else
1813 {
1814 return CSON_REALLOC_IMPL( hint, n );
1815 }
1816 }
1817
1818
1819 #undef CSON_LOG_ALLOC
@@ -4876,10 +4904,13 @@
4904 #undef CSON_DBL
4905 #undef CSON_STR
4906 #undef CSON_OBJ
4907 #undef CSON_ARRAY
4908 #undef CSON_VCAST
4909 #undef CSON_MALLOC_IMPL
4910 #undef CSON_FREE_IMPL
4911 #undef CSON_REALLOC_IMPL
4912 /* end file ./cson.c */
4913 /* begin file ./cson_lists.h */
4914 /* Auto-generated from cson_list.h. Edit at your own risk! */
4915 unsigned int cson_value_list_reserve( cson_value_list * self, unsigned int n )
4916 {
4917
M src/main.mk
+5 -2
--- src/main.mk
+++ src/main.mk
@@ -336,10 +336,12 @@
336336
 # an executable named "manifest" out of the file named "manifest.c"
337337
 #
338338
 $(SRCDIR)/../manifest:
339339
 # noop
340340
341
+$(OBJDIR)/cson_amalgamation.o: CPPFLAGS+="-DCSON_FOSSIL_MODE"
342
+
341343
 clean:
342344
 rm -rf $(OBJDIR)/* $(APPNAME)
343345
344346
345347
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
@@ -990,8 +992,9 @@
990992
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
991993
992994
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
993995
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
994996
995
-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
996
- $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
997
+
998
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
999
+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
9971000
9981001
--- src/main.mk
+++ src/main.mk
@@ -336,10 +336,12 @@
336 # an executable named "manifest" out of the file named "manifest.c"
337 #
338 $(SRCDIR)/../manifest:
339 # noop
340
 
 
341 clean:
342 rm -rf $(OBJDIR)/* $(APPNAME)
343
344
345 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
@@ -990,8 +992,9 @@
990 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
991
992 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
993 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
994
995 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
996 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
 
997
998
--- src/main.mk
+++ src/main.mk
@@ -336,10 +336,12 @@
336 # an executable named "manifest" out of the file named "manifest.c"
337 #
338 $(SRCDIR)/../manifest:
339 # noop
340
341 $(OBJDIR)/cson_amalgamation.o: CPPFLAGS+="-DCSON_FOSSIL_MODE"
342
343 clean:
344 rm -rf $(OBJDIR)/* $(APPNAME)
345
346
347 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
@@ -990,8 +992,9 @@
992 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
993
994 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
995 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
996
997
998 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
999 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1000
1001
M src/makemake.tcl
+7 -3
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -222,10 +222,12 @@
222222
 # an executable named "manifest" out of the file named "manifest.c"
223223
 #
224224
 $(SRCDIR)/../manifest:
225225
 # noop
226226
227
+$(OBJDIR)/cson_amalgamation.o: CPPFLAGS+="-DCSON_FOSSIL_MODE"
228
+
227229
 clean:
228230
 rm -rf $(OBJDIR)/* $(APPNAME)
229231
230232
 }
231233
@@ -277,12 +279,14 @@
277279
278280
 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
279281
 writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
280282
281283
 set opt {}
282
-writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
283
-writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
284
+writeln {
285
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
286
+ $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
287
+}
284288
285289
286290
 close $output_file
287291
 #
288292
 # End of the main.mk output
@@ -485,11 +489,11 @@
485489
 set opt $SQLITE_OPTIONS
486490
 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
487491
488492
 set opt {}
489493
 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
490
-writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
494
+writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
491495
 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
492496
493497
 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
494498
 set opt {-Dmain=sqlite3_shell}
495499
 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
496500
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -222,10 +222,12 @@
222 # an executable named "manifest" out of the file named "manifest.c"
223 #
224 $(SRCDIR)/../manifest:
225 # noop
226
 
 
227 clean:
228 rm -rf $(OBJDIR)/* $(APPNAME)
229
230 }
231
@@ -277,12 +279,14 @@
277
278 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
279 writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
280
281 set opt {}
282 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
283 writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
 
 
284
285
286 close $output_file
287 #
288 # End of the main.mk output
@@ -485,11 +489,11 @@
485 set opt $SQLITE_OPTIONS
486 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
487
488 set opt {}
489 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
490 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o\n"
491 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
492
493 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
494 set opt {-Dmain=sqlite3_shell}
495 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
496
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -222,10 +222,12 @@
222 # an executable named "manifest" out of the file named "manifest.c"
223 #
224 $(SRCDIR)/../manifest:
225 # noop
226
227 $(OBJDIR)/cson_amalgamation.o: CPPFLAGS+="-DCSON_FOSSIL_MODE"
228
229 clean:
230 rm -rf $(OBJDIR)/* $(APPNAME)
231
232 }
233
@@ -277,12 +279,14 @@
279
280 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
281 writeln "\t\$(XTCC) -I\$(SRCDIR) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n"
282
283 set opt {}
284 writeln {
285 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
286 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
287 }
288
289
290 close $output_file
291 #
292 # End of the main.mk output
@@ -485,11 +489,11 @@
489 set opt $SQLITE_OPTIONS
490 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n"
491
492 set opt {}
493 writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR)/cson_amalgamation.c"
494 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/cson_amalgamation.c -o \$(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE\n"
495 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h"
496
497 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
498 set opt {-Dmain=sqlite3_shell}
499 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1"
500
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1051,11 +1051,11 @@
10511051
 zip.h: $(OBJDIR)/headers
10521052
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
10531053
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
10541054
10551055
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1056
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1056
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
10571057
10581058
 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
10591059
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
10601060
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
10611061
10621062
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1051,11 +1051,11 @@
1051 zip.h: $(OBJDIR)/headers
1052 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1053 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1054
1055 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1056 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o
1057
1058 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1059 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1060 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1061
1062
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1051,11 +1051,11 @@
1051 zip.h: $(OBJDIR)/headers
1052 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1053 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1054
1055 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1056 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1057
1058 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1059 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1060 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1061
1062

Keyboard Shortcuts

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