From fb8ac1d5c92714165cd48cb9f856721c20efad2d Mon Sep 17 00:00:00 2001 From: Francesco Cozzuto Date: Tue, 28 Oct 2025 17:33:52 +0100 Subject: [PATCH] Fix compiler errors --- Makefile | 2 +- src/basic.c | 2 ++ src/client.c | 5 +---- src/config.h | 9 +++++++++ src/main.c | 4 ++++ src/metadata_server.h | 1 + src/tcp.h | 4 ++++ 7 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 src/config.h diff --git a/Makefile b/Makefile index ff5b71c..2d24f5c 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ tinydfs_server$(EXT): $(CFILES) $(HFILES) gcc -o $@ $(CFILES) $(CFLAGS) $(LFLAGS) -Iinc example_client$(EXT): examples/main.c $(CFILES) $(HFILES) - gcc -o $@ examples/main.c $(CFILES) $(CFLAGS) $(LFLAGS) -Iinc + gcc -o $@ examples/main.c $(CFILES) $(CFLAGS) $(LFLAGS) -Iinc -DBUILD_LIBRARY clean: rm \ diff --git a/src/basic.c b/src/basic.c index 42a87f7..edd41a3 100644 --- a/src/basic.c +++ b/src/basic.c @@ -1,4 +1,6 @@ #ifdef _WIN32 +#define WIN32_LEAN_AND_MEAN +#include #else #include #endif diff --git a/src/client.c b/src/client.c index 193132f..fdfc6be 100644 --- a/src/client.c +++ b/src/client.c @@ -8,12 +8,10 @@ #endif #include "tcp.h" +#include "config.h" #include "message.h" #include -#define MAX_OPERATIONS 128 -#define MAX_REQUESTS_PER_QUEUE 128 - #define TAG_METADATA_SERVER -2 #define TAG_METADATA_SERVER_TO_CLIENT -3 @@ -88,7 +86,6 @@ struct TinyDFS { int num_operations; Operation operations[MAX_OPERATIONS]; - }; TinyDFS *tinydfs_init(char *addr, uint16_t port) diff --git a/src/config.h b/src/config.h new file mode 100644 index 0000000..da9fa93 --- /dev/null +++ b/src/config.h @@ -0,0 +1,9 @@ +#ifndef CONFIG_INCLUDED +#define CONFIG_INCLUDED + +#define MAX_SERVER_ADDRS 4 +#define MAX_CHUNK_SERVERS 128 +#define MAX_OPERATIONS 128 +#define MAX_REQUESTS_PER_QUEUE 128 + +#endif // CONFIG_INCLUDED diff --git a/src/main.c b/src/main.c index 4e9a274..a9b801e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,3 +1,5 @@ +#ifndef BUILD_LIBRARY + #include #include "chunk_server.h" @@ -43,3 +45,5 @@ int main(int argc, char **argv) } return 0; } + +#endif // BUILD_LIBRARY diff --git a/src/metadata_server.h b/src/metadata_server.h index d67cfac..120c224 100644 --- a/src/metadata_server.h +++ b/src/metadata_server.h @@ -3,6 +3,7 @@ #include "tcp.h" #include "file_tree.h" +#include "config.h" #define CONNECTION_TAG_CLIENT -1 #define CONNECTION_TAG_UNKNOWN -2 diff --git a/src/tcp.h b/src/tcp.h index 92cbf4a..771a014 100644 --- a/src/tcp.h +++ b/src/tcp.h @@ -4,6 +4,10 @@ #include #ifdef _WIN32 +#include +#include +#define POLL WSAPoll +#define CLOSE_SOCKET closesocket #else #include #include