Fossil SCM

Corrections to #ifdef handling and comments.

mistachkin 2014-06-08 20:28 th1Hooks
Commit f605058514b8335f52648f6f771330b32f56418c
Parent b3c40dd49ea8de8…
5 files changed +1 -1 +6 -2 +1 -1 +1 -1 +1 -1
~ auto.def ~ src/main.c ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin
M auto.def
+1 -1
--- auto.def
+++ auto.def
@@ -4,11 +4,11 @@
44
55
 options {
66
 with-openssl:path|auto|none
77
 => {Look for openssl in the given path, or auto or none}
88
 with-zlib:path => {Look for zlib in the given path}
9
- with-th1-hooks=0 => {Enable TH1 hooks for commands and unknown web pages}
9
+ with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
1010
 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
1111
 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
1212
 with-tcl-private-stubs=0
1313
 => {Enable Tcl integration via private stubs mechanism}
1414
 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
1515
--- auto.def
+++ auto.def
@@ -4,11 +4,11 @@
4
5 options {
6 with-openssl:path|auto|none
7 => {Look for openssl in the given path, or auto or none}
8 with-zlib:path => {Look for zlib in the given path}
9 with-th1-hooks=0 => {Enable TH1 hooks for commands and unknown web pages}
10 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
11 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
12 with-tcl-private-stubs=0
13 => {Enable Tcl integration via private stubs mechanism}
14 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
15
--- auto.def
+++ auto.def
@@ -4,11 +4,11 @@
4
5 options {
6 with-openssl:path|auto|none
7 => {Look for openssl in the given path, or auto or none}
8 with-zlib:path => {Look for zlib in the given path}
9 with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
10 with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
11 with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
12 with-tcl-private-stubs=0
13 => {Enable Tcl integration via private stubs mechanism}
14 internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
15
M src/main.c
+6 -2
--- src/main.c
+++ src/main.c
@@ -673,12 +673,12 @@
673673
 }
674674
 if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK || rc==TH_CONTINUE) ){
675675
 Th_CommandNotify(zCmdName, 0);
676676
 }
677677
 }
678
-#endif
679678
 fossil_exit(0);
679
+#endif
680680
 }else if( rc==2 ){
681681
 int i, n;
682682
 Blob couldbe;
683683
 blob_zero(&couldbe);
684684
 n = strlen(zCmdName);
@@ -1590,11 +1590,15 @@
15901590
 rc = Th_WebpageHook(aWebpage[idx].zName, aWebpage[idx].cmdFlags);
15911591
 }else{
15921592
 rc = TH_OK;
15931593
 }
15941594
 if( rc==TH_OK || rc==TH_RETURN || rc==TH_CONTINUE ){
1595
- if( rc==TH_OK || rc==TH_RETURN ){ aWebpage[idx].xFunc(); }
1595
+ if( rc==TH_OK || rc==TH_RETURN ){
1596
+#endif
1597
+ aWebpage[idx].xFunc();
1598
+#ifdef FOSSIL_ENABLE_TH1_HOOKS
1599
+ }
15961600
 if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK || rc==TH_CONTINUE) ){
15971601
 Th_WebpageNotify(aWebpage[idx].zName, aWebpage[idx].cmdFlags);
15981602
 }
15991603
 }
16001604
 #endif
16011605
--- src/main.c
+++ src/main.c
@@ -673,12 +673,12 @@
673 }
674 if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK || rc==TH_CONTINUE) ){
675 Th_CommandNotify(zCmdName, 0);
676 }
677 }
678 #endif
679 fossil_exit(0);
 
680 }else if( rc==2 ){
681 int i, n;
682 Blob couldbe;
683 blob_zero(&couldbe);
684 n = strlen(zCmdName);
@@ -1590,11 +1590,15 @@
1590 rc = Th_WebpageHook(aWebpage[idx].zName, aWebpage[idx].cmdFlags);
1591 }else{
1592 rc = TH_OK;
1593 }
1594 if( rc==TH_OK || rc==TH_RETURN || rc==TH_CONTINUE ){
1595 if( rc==TH_OK || rc==TH_RETURN ){ aWebpage[idx].xFunc(); }
 
 
 
 
1596 if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK || rc==TH_CONTINUE) ){
1597 Th_WebpageNotify(aWebpage[idx].zName, aWebpage[idx].cmdFlags);
1598 }
1599 }
1600 #endif
1601
--- src/main.c
+++ src/main.c
@@ -673,12 +673,12 @@
673 }
674 if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK || rc==TH_CONTINUE) ){
675 Th_CommandNotify(zCmdName, 0);
676 }
677 }
 
678 fossil_exit(0);
679 #endif
680 }else if( rc==2 ){
681 int i, n;
682 Blob couldbe;
683 blob_zero(&couldbe);
684 n = strlen(zCmdName);
@@ -1590,11 +1590,15 @@
1590 rc = Th_WebpageHook(aWebpage[idx].zName, aWebpage[idx].cmdFlags);
1591 }else{
1592 rc = TH_OK;
1593 }
1594 if( rc==TH_OK || rc==TH_RETURN || rc==TH_CONTINUE ){
1595 if( rc==TH_OK || rc==TH_RETURN ){
1596 #endif
1597 aWebpage[idx].xFunc();
1598 #ifdef FOSSIL_ENABLE_TH1_HOOKS
1599 }
1600 if( !g.isHTTP && !g.fNoThHook && (rc==TH_OK || rc==TH_CONTINUE) ){
1601 Th_WebpageNotify(aWebpage[idx].zName, aWebpage[idx].cmdFlags);
1602 }
1603 }
1604 #endif
1605
M src/makemake.tcl
+1 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -409,11 +409,11 @@
409409
410410
 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
411411
 #
412412
 # FOSSIL_ENABLE_SSL = 1
413413
414
-#### Enable hooks for commands and unknown web pages via TH1
414
+#### Enable hooks for commands and web pages via TH1
415415
 #
416416
 # FOSSIL_ENABLE_TH1_HOOKS = 1
417417
418418
 #### Enable scripting support via Tcl/Tk
419419
 #
420420
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -409,11 +409,11 @@
409
410 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
411 #
412 # FOSSIL_ENABLE_SSL = 1
413
414 #### Enable hooks for commands and unknown web pages via TH1
415 #
416 # FOSSIL_ENABLE_TH1_HOOKS = 1
417
418 #### Enable scripting support via Tcl/Tk
419 #
420
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -409,11 +409,11 @@
409
410 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
411 #
412 # FOSSIL_ENABLE_SSL = 1
413
414 #### Enable hooks for commands and web pages via TH1
415 #
416 # FOSSIL_ENABLE_TH1_HOOKS = 1
417
418 #### Enable scripting support via Tcl/Tk
419 #
420
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -48,11 +48,11 @@
4848
4949
 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
5050
 #
5151
 # FOSSIL_ENABLE_SSL = 1
5252
53
-#### Enable hooks for commands and unknown web pages via TH1
53
+#### Enable hooks for commands and web pages via TH1
5454
 #
5555
 # FOSSIL_ENABLE_TH1_HOOKS = 1
5656
5757
 #### Enable scripting support via Tcl/Tk
5858
 #
5959
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -48,11 +48,11 @@
48
49 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
50 #
51 # FOSSIL_ENABLE_SSL = 1
52
53 #### Enable hooks for commands and unknown web pages via TH1
54 #
55 # FOSSIL_ENABLE_TH1_HOOKS = 1
56
57 #### Enable scripting support via Tcl/Tk
58 #
59
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -48,11 +48,11 @@
48
49 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
50 #
51 # FOSSIL_ENABLE_SSL = 1
52
53 #### Enable hooks for commands and web pages via TH1
54 #
55 # FOSSIL_ENABLE_TH1_HOOKS = 1
56
57 #### Enable scripting support via Tcl/Tk
58 #
59
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -48,11 +48,11 @@
4848
4949
 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
5050
 #
5151
 FOSSIL_ENABLE_SSL = 1
5252
53
-#### Enable hooks for commands and unknown web pages via TH1
53
+#### Enable hooks for commands and web pages via TH1
5454
 #
5555
 FOSSIL_ENABLE_TH1_HOOKS = 1
5656
5757
 #### Enable scripting support via Tcl/Tk
5858
 #
5959
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -48,11 +48,11 @@
48
49 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
50 #
51 FOSSIL_ENABLE_SSL = 1
52
53 #### Enable hooks for commands and unknown web pages via TH1
54 #
55 FOSSIL_ENABLE_TH1_HOOKS = 1
56
57 #### Enable scripting support via Tcl/Tk
58 #
59
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -48,11 +48,11 @@
48
49 #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
50 #
51 FOSSIL_ENABLE_SSL = 1
52
53 #### Enable hooks for commands and web pages via TH1
54 #
55 FOSSIL_ENABLE_TH1_HOOKS = 1
56
57 #### Enable scripting support via Tcl/Tk
58 #
59

Keyboard Shortcuts

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