-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Use LUA_PKGNAME to select lua version instead of patching makefile. That option for make was added in the following upstream commit andmarti1424/sc-im@5c2e0a1 * Update lua dependency to lua5.4. * Fix the following compiler error with interp.c and modified langinfo.h. langinfo.h:107:1: error: function definition is not allowed here
- Loading branch information
Showing
3 changed files
with
28 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
--- a/src/interp.c | ||
+++ b/src/interp.c | ||
@@ -1540,6 +1540,10 @@ | ||
return; | ||
} | ||
|
||
+#ifdef USELOCALE | ||
+#include <locale.h> | ||
+#include <langinfo.h> | ||
+#endif | ||
|
||
/** | ||
* \brief slet() | ||
@@ -1609,8 +1613,6 @@ | ||
// reconvert numeric value based on locale's D_FMT format instead of current format | ||
char * f = &v->format[1]; | ||
#ifdef USELOCALE | ||
- #include <locale.h> | ||
- #include <langinfo.h> | ||
char * loc = NULL; | ||
f = NULL; | ||
loc = setlocale(LC_TIME, ""); |