You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
114 lines
3.6 KiB
114 lines
3.6 KiB
Index: src/admin/admin.c |
|
--- src/admin/admin.c.orig 2012-03-14 14:18:33.000000000 +0100 |
|
+++ src/admin/admin.c 2014-10-12 10:09:18.009801532 +0200 |
|
@@ -29,6 +29,9 @@ |
|
#include <stdarg.h> |
|
#include <math.h> |
|
#include <glib.h> |
|
+#include <sys/types.h> |
|
+#include <sys/socket.h> |
|
+#include <netinet/in.h> |
|
|
|
#include "../common/4store.h" |
|
#include "../common/error.h" |
|
Index: src/admin/admin_backend.c |
|
--- src/admin/admin_backend.c.orig 2012-03-14 14:18:33.000000000 +0100 |
|
+++ src/admin/admin_backend.c 2014-10-12 10:08:42.409381816 +0200 |
|
@@ -29,6 +29,7 @@ |
|
#include <signal.h> |
|
#include <time.h> |
|
#include <sys/stat.h> |
|
+#include <sys/wait.h> |
|
|
|
#include "../common/params.h" |
|
#include "../common/error.h" |
|
Index: src/admin/admin_common.c |
|
--- src/admin/admin_common.c.orig 2012-03-14 14:18:34.000000000 +0100 |
|
+++ src/admin/admin_common.c 2014-10-12 10:05:12.889614354 +0200 |
|
@@ -23,6 +23,8 @@ |
|
#include <string.h> |
|
#include <errno.h> |
|
#include <stdio.h> |
|
+#include <sys/types.h> |
|
+#include <sys/socket.h> |
|
#include <arpa/inet.h> |
|
|
|
#include "admin_common.h" |
|
Index: src/admin/admin_frontend.c |
|
--- src/admin/admin_frontend.c.orig 2012-03-14 14:18:34.000000000 +0100 |
|
+++ src/admin/admin_frontend.c 2014-10-12 10:05:12.889614354 +0200 |
|
@@ -23,6 +23,14 @@ |
|
#include <string.h> |
|
#include <errno.h> |
|
#include <stdio.h> |
|
+#include <sys/types.h> |
|
+#include <sys/socket.h> |
|
+#include <netinet/in.h> |
|
+#include <arpa/inet.h> |
|
+ |
|
+#include "admin_common.h" |
|
+#include "admin_frontend.h" |
|
+#include "../common/params.h" |
|
#include <arpa/inet.h> |
|
|
|
#include "admin_common.h" |
|
Index: src/backend/backend.c |
|
--- src/backend/backend.c.orig 2011-10-26 15:34:25.000000000 +0200 |
|
+++ src/backend/backend.c 2014-10-12 10:05:12.889614354 +0200 |
|
@@ -566,7 +566,7 @@ |
|
if (files & FS_OPEN_LEX && !be->res) { |
|
be->res = fs_rhash_open(be, "res", flags); |
|
if (!be->res) { |
|
- fs_error(LOG_ERR, "failed to open resurce file"); |
|
+ fs_error(LOG_ERR, "failed to open resource file"); |
|
|
|
return 1; |
|
} |
|
Index: src/common/4s-server.c |
|
--- src/common/4s-server.c.orig 2012-05-16 12:18:24.000000000 +0200 |
|
+++ src/common/4s-server.c 2014-10-12 10:07:54.189350249 +0200 |
|
@@ -38,6 +38,7 @@ |
|
#include <glib.h> |
|
#include <netinet/in.h> |
|
#include <sys/stat.h> |
|
+#include <sys/wait.h> |
|
|
|
static char *global_kb_name = NULL; |
|
static float global_disk_limit = 0.0f; |
|
Index: src/common/qsort.c |
|
--- src/common/qsort.c.orig 2011-04-04 11:34:13.000000000 +0200 |
|
+++ src/common/qsort.c 2014-10-12 10:05:12.889614354 +0200 |
|
@@ -22,9 +22,6 @@ |
|
Software - Practice and Experience; Vol. 23 (11), 1249-1265, 1993. */ |
|
|
|
#include <4store-config.h> |
|
-#ifdef HAVE_ALLOCA_H |
|
-#include <alloca.h> |
|
-#endif |
|
#include <limits.h> |
|
#include <stdlib.h> |
|
#include <string.h> |
|
Index: src/frontend/Makefile.in |
|
--- src/frontend/Makefile.in.orig 2012-07-10 10:57:13.000000000 +0200 |
|
+++ src/frontend/Makefile.in 2014-10-12 10:05:12.899368010 +0200 |
|
@@ -200,7 +200,7 @@ |
|
LD = @LD@ |
|
LDFLAGS = @LDFLAGS@ |
|
LIBOBJS = @LIBOBJS@ |
|
-LIBS = $(PROFILE) -lncurses -lreadline @GLIB_LIBS@ `pcre-config --libs` |
|
+LIBS = $(PROFILE) -lreadline -lncurses @GLIB_LIBS@ `pcre-config --libs` |
|
LIBTOOL = @LIBTOOL@ |
|
LIBXML_CFLAGS = @LIBXML_CFLAGS@ |
|
LIBXML_LIBS = @LIBXML_LIBS@ |
|
Index: src/frontend/size.c |
|
--- src/frontend/size.c.orig 2011-12-08 11:36:44.000000000 +0100 |
|
+++ src/frontend/size.c 2014-10-12 10:05:12.899368010 +0200 |
|
@@ -101,8 +101,6 @@ |
|
printf("%5s%12lld%+12lld%12lld%12lld\n", |
|
"TOTAL", total.quads_s, (total.quads_sr - total.quads_s), |
|
total.models_s, total.resources); |
|
- printf("\ncollision probability ≅ %.2Lf%%\n", 100.0 * (1.0 - expl(-(total.resources * (total.resources-1.0) / (2.0 * CONST_2to63))))); |
|
- |
|
fsp_close_link(link); |
|
} |
|
|
|
|