Fossil SCM
More compilation fixes for Jim when compiling with MSVC.
Commit
38d1b52283e4fa99ee731c041bdb1b0c6cc69ac9
Parent
0039d32b88de5a6…
2 files changed
+3
-1
+1
-1
+3
-1
| --- src/th_main.c | ||
| +++ src/th_main.c | ||
| @@ -396,13 +396,15 @@ | ||
| 396 | 396 | /* |
| 397 | 397 | ** Retrieve a string value (variable) from the interpreter. If no such |
| 398 | 398 | ** variable exists, return NULL. |
| 399 | 399 | */ |
| 400 | 400 | const char *Th_Fetch(const char *zName){ |
| 401 | + Jim_Obj *objPtr; | |
| 402 | + | |
| 401 | 403 | Th_FossilInit(); |
| 402 | 404 | |
| 403 | - Jim_Obj *objPtr = Jim_GetVariableStr(g.interp, zName, JIM_NONE); | |
| 405 | + objPtr = Jim_GetVariableStr(g.interp, zName, JIM_NONE); | |
| 404 | 406 | |
| 405 | 407 | return objPtr ? Jim_String(objPtr) : NULL; |
| 406 | 408 | } |
| 407 | 409 | |
| 408 | 410 | /** |
| 409 | 411 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -396,13 +396,15 @@ | |
| 396 | /* |
| 397 | ** Retrieve a string value (variable) from the interpreter. If no such |
| 398 | ** variable exists, return NULL. |
| 399 | */ |
| 400 | const char *Th_Fetch(const char *zName){ |
| 401 | Th_FossilInit(); |
| 402 | |
| 403 | Jim_Obj *objPtr = Jim_GetVariableStr(g.interp, zName, JIM_NONE); |
| 404 | |
| 405 | return objPtr ? Jim_String(objPtr) : NULL; |
| 406 | } |
| 407 | |
| 408 | /** |
| 409 |
| --- src/th_main.c | |
| +++ src/th_main.c | |
| @@ -396,13 +396,15 @@ | |
| 396 | /* |
| 397 | ** Retrieve a string value (variable) from the interpreter. If no such |
| 398 | ** variable exists, return NULL. |
| 399 | */ |
| 400 | const char *Th_Fetch(const char *zName){ |
| 401 | Jim_Obj *objPtr; |
| 402 | |
| 403 | Th_FossilInit(); |
| 404 | |
| 405 | objPtr = Jim_GetVariableStr(g.interp, zName, JIM_NONE); |
| 406 | |
| 407 | return objPtr ? Jim_String(objPtr) : NULL; |
| 408 | } |
| 409 | |
| 410 | /** |
| 411 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -427,11 +427,11 @@ | ||
| 427 | 427 | |
| 428 | 428 | info_.c : $(SRCDIR)\info.c |
| 429 | 429 | translate$E $** > $@ |
| 430 | 430 | |
| 431 | 431 | $(OX)\jimtcl$O : $(SRCDIR)\..\autosetup\jimsh0.c |
| 432 | - $(TCC) /Fo$@ /DJIM_BOOTSTRAP_LIB_ONLY -c $(SRCDIR)\..\autosetup\jimsh0.c | |
| 432 | + $(TCC) /Fo$@ /DHAVE_MKDIR_ONE_ARG /DJIM_BOOTSTRAP_LIB_ONLY -c $(SRCDIR)\..\autosetup\jimsh0.c | |
| 433 | 433 | |
| 434 | 434 | $(OX)\json$O : json_.c json.h |
| 435 | 435 | $(TCC) /Fo$@ -c json_.c |
| 436 | 436 | |
| 437 | 437 | json_.c : $(SRCDIR)\json.c |
| 438 | 438 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -427,11 +427,11 @@ | |
| 427 | |
| 428 | info_.c : $(SRCDIR)\info.c |
| 429 | translate$E $** > $@ |
| 430 | |
| 431 | $(OX)\jimtcl$O : $(SRCDIR)\..\autosetup\jimsh0.c |
| 432 | $(TCC) /Fo$@ /DJIM_BOOTSTRAP_LIB_ONLY -c $(SRCDIR)\..\autosetup\jimsh0.c |
| 433 | |
| 434 | $(OX)\json$O : json_.c json.h |
| 435 | $(TCC) /Fo$@ -c json_.c |
| 436 | |
| 437 | json_.c : $(SRCDIR)\json.c |
| 438 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -427,11 +427,11 @@ | |
| 427 | |
| 428 | info_.c : $(SRCDIR)\info.c |
| 429 | translate$E $** > $@ |
| 430 | |
| 431 | $(OX)\jimtcl$O : $(SRCDIR)\..\autosetup\jimsh0.c |
| 432 | $(TCC) /Fo$@ /DHAVE_MKDIR_ONE_ARG /DJIM_BOOTSTRAP_LIB_ONLY -c $(SRCDIR)\..\autosetup\jimsh0.c |
| 433 | |
| 434 | $(OX)\json$O : json_.c json.h |
| 435 | $(TCC) /Fo$@ -c json_.c |
| 436 | |
| 437 | json_.c : $(SRCDIR)\json.c |
| 438 |