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
diff --git a/Makefile.devel b/Makefile.devel | |
index 8f6399c..320c123 100644 | |
--- a/Makefile.devel | |
+++ b/Makefile.devel | |
@@ -106,7 +106,7 @@ lib/aliases.h lib/canonical.h lib/canonical_local.h : lib/encodings.def lib/enco | |
$(CC) $(CFLAGS) lib/genaliases.c -o genaliases | |
./genaliases > lib/aliases.gperf 3> canonical.sh 4> canonical_local.sh | |
$(RM) genaliases | |
- $(GPERF) -m 10 lib/aliases.gperf > tmp.h | |
+ $(GPERF) lib/aliases.gperf > tmp.h |
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
diff --git a/screen-write.c b/screen-write.c | |
index 15f8d07..8a175a6 100644 | |
--- a/screen-write.c | |
+++ b/screen-write.c | |
@@ -1334,6 +1334,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) | |
ctx->cells++; | |
/* If the width is zero, combine onto the previous character. */ | |
+ /* | |
if (width == 0) { |
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
diff --git a/Src/utils.c b/Src/utils.c | |
index 26e2a5c..04c3783 100644 | |
--- a/Src/utils.c | |
+++ b/Src/utils.c | |
@@ -4244,6 +4244,13 @@ mod_export char * | |
zreaddir(DIR *dir, int ignoredots) | |
{ | |
struct dirent *de; | |
+#ifdef HAVE_ICONV | |
+ static iconv_t conv_ds = (iconv_t)NULL; |
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
diff --git a/Src/compat.c b/Src/compat.c | |
index 9041c0b..4d2b320 100644 | |
--- a/Src/compat.c | |
+++ b/Src/compat.c | |
@@ -860,6 +860,7 @@ int mk_wcswidth(const wchar_t *pwcs, size_t n) | |
return width; | |
} | |
+#endif /* 0 */ | |
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
diff --git a/Makefile.in b/Makefile.in | |
index 60bb1ed..d8cba0d 100644 | |
--- a/Makefile.in | |
+++ b/Makefile.in | |
@@ -4609,7 +4609,7 @@ src_logname_LDADD = $(LDADD) | |
# for cap_get_file | |
src_ls_LDADD = $(LDADD) $(LIB_SELINUX) $(LIB_SMACK) \ | |
- $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_ACL) | |
+ $(LIB_CLOCK_GETTIME) $(LIB_CAP) $(LIB_HAS_ACL) $(LIBICONV) |
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
diff --git a/main.c b/main.c | |
index b421943..865c744 100644 | |
--- a/main.c | |
+++ b/main.c | |
@@ -833,7 +833,12 @@ main(int argc, char **argv, char **envp) | |
mySignal(SIGPIPE, SigPipe); | |
#endif | |
+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2 | |
+ orig_GC_warn_proc = GC_get_warn_proc(); |
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
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/"> | |
<os:ShortName>Google SSL</os:ShortName> | |
<os:Description>Google SSL</os:Description> | |
<os:InputEncoding>UTF-8</os:InputEncoding> | |
<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAKMWlDQ1BJQ0MgUHJvZmlsZQAAeJydlndUU9kWh8+9N71QkhCKlNBraFICSA29SJEuKjEJEErAkAAiNkRUcERRkaYIMijggKNDkbEiioUBUbHrBBlE1HFwFBuWSWStGd+8ee/Nm98f935rn73P3Wfvfda6AJD8gwXCTFgJgAyhWBTh58WIjYtnYAcBDPAAA2wA4HCzs0IW+EYCmQJ82IxsmRP4F726DiD5+yrTP4zBAP+flLlZIjEAUJiM5/L42VwZF8k4PVecJbdPyZi2NE3OMErOIlmCMlaTc/IsW3z2mWUPOfMyhDwZy3PO4mXw5Nwn4405Er6MkWAZF+cI+LkyviZjg3RJhkDGb+SxGXxONgAoktwu5nNTZGwtY5IoMoIt43kA4EjJX/DSL1jMzxPLD8XOzFouEiSniBkmXFOGjZMTi+HPz03ni8XMMA43jSPiMdiZGVkc4XIAZs/8WRR5bRmyIjvYODk4MG0tbb4o1H9d/JuS93aWXoR/7hlEH/jD9ld+mQ0AsKZltdn6h21pFQBd6wFQu/2HzWAvAIqyvnUOfXEeunxeUsTiLGcrq9zcXEsBn2spL+jv+p8Of0NffM9Svt3v5WF485M4knQxQ143bmZ6pkTEyM7icPkM5p+H+B8H/nUeFhH8JL6IL5RFRMumTCBMlrVbyBOI |
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
diff --git a/Gemfile b/Gemfile | |
new file mode 100644 | |
index 0000000..645da62 | |
--- /dev/null | |
+++ b/Gemfile | |
@@ -0,0 +1,16 @@ | |
+source 'http://rubygems.org' | |
+ | |
+gem 'rails', '2.3.14' | |
+ |
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
diff --git a/bonnie.h b/bonnie.h | |
index dea2c12..38d69c2 100644 | |
--- a/bonnie.h | |
+++ b/bonnie.h | |
@@ -22,7 +22,7 @@ typedef FILE *PFILE; | |
// data includes index to which directory (6 bytes) and terminating '\0' for | |
// the name and pointer to file name | |
#define MaxDataPerFile (MaxNameLen + 6 + 1 + sizeof(void *)) | |
-#define MinTime (0.5) | |
+#define MinTime (0.01) |
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
diff --git a/_felidlabo/list/mingw.txt b/_felidlabo/list/mingw.txt | |
index fc2c757..c6fdb24 100644 | |
--- a/_felidlabo/list/mingw.txt | |
+++ b/_felidlabo/list/mingw.txt | |
@@ -3,33 +3,33 @@ | |
# GCC | |
http://jaist.dl.sourceforge.net/project/tdm-gcc/TDM-GCC%204.5%20series/4.5.2-tdm-1%20SJLJ/gcc-4.5.2-tdm-1-core.tar.lzma gcc-4.5.2-tdm-1-core.tar.lzma _felidlabo\gcc\gcc-4.5.2-tdm-1 | |
http://jaist.dl.sourceforge.net/project/tdm-gcc/TDM-GCC%204.5%20series/4.5.2-tdm-1%20SJLJ/gcc-4.5.2-tdm-1-c++.tar.lzma gcc-4.5.2-tdm-1-c++.tar.lzma _felidlabo\gcc\gcc-4.5.2-tdm-1 | |
-#http://jaist.dl.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version3/Current%20Release_%20gcc-3.4.5-20060117-3/gcc-core-3.4.5-20060117-3.tar.gz gcc-core-3.4.5-20060117-3.tar.gz _felidlabo\gcc\gcc-3.4.5-20060117-3 | |
-#http://jaist.dl.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version3/Current%20Release_%20gcc-3.4.5-20060117-3/gcc-g++-3.4.5-20060117-3.tar.gz gcc-g++-3.4.5-20060117-3.tar.gz _felidlabo\gcc\gcc-3.4.5-20060117-3 |
OlderNewer