search for: nbdkit_functions

I pushed a few of the msys2 patches upstream. I changed the way that $(SHARED_LDFLAGS) works so it's more to my liking, and the others were pushed unchanged. Three patches remain which I'm posting on the mailing list for proper review. Rich.

...tent (struct nbdkit_extents *, uint64_t offset, uint64_t length, uint32_t type); +#else +static void nbdkit_error (const char *msg, ...) + ATTRIBUTE_FORMAT_PRINTF (1, 2); +static void nbdkit_error (const char *msg, ...) +{ + va_list args; + va_start(args, msg); + _nbdkit_functions.verror(msg, args); + va_end(args); +} +static void nbdkit_verror (const char *msg, va_list args) + ATTRIBUTE_FORMAT_PRINTF (1, 0); +static void nbdkit_verror (const char *msg, va_list args) +{ + _nbdkit_functions.verror (msg, args); +} +static void nbdkit_debug (const char *msg, ...) + ATTRIBUT...

...ff --git a/server/main.c b/server/main.c index b303146c..373918cf 100644 --- a/server/main.c +++ b/server/main.c @@ -104,6 +104,7 @@ unsigned int socket_activation /* $LISTEN_FDS and $LISTEN_PID set */; /* The linked list of zero or more filters, and one plugin. */ struct backend *top; +struct nbdkit_functions *functions = NULL; static char *random_fifo_dir = NULL; static char *random_fifo = NULL; @@ -152,6 +153,49 @@ dump_config (void) printf ("%s=%d\n", "version_minor", NBDKIT_VERSION_MINOR); } +#ifdef WINDOWS_COMPAT +static int dummy_peer_name (void *addr, void *addrlen)...

...l compilation for mingw is needed for something, then this would be fine. * Unclear why it's necessary to rename nbdkit-common.h -> nbdkit-compat.h ? While this isn't API, it seems we should not rename it unless there's a good reason. * Functions are indirected through struct nbdkit_functions _nbdkit_functions which I guess is necessary because of PE linking (we've had similar problems with PE linking restrictions in other programs). However I wasn't very clear how this actually works, and we cannot break existing Linux binaries, so this needs more thought and must be...

Answering a few questions: * Unclear why it's necessary to rename nbdkit-common.h -> nbdkit-compat.h - It's not a rename, but a new file. nbdkit-compat.h is included for PE DLL compatibility, and is included in nbdkit-common.h * Functions are indirected through struct nbdkit_functions _nbdkit_functions which I guess is necessary because of PE linking (we've had similar problems with PE linking restrictions in other programs). However I wasn't very clear how this actually works, and we cannot break existing Linux binaries, so this needs more thought and must be...