Merge lp:~kreeblah/smpq/macos_compilation_fix into lp:smpq

[Kreeblah]

This fixes compilation on macOS. It adds a couple of macOS define guards to include a header in two files that need it.

[Pali (pali)]

Hello, could you provide the compile error output log which you got?

Both stdio.h and string.h are standard C header files, nothing macOS specific, so I have feeling that something may be somewhere missing and it does not have to affect only macOS.

[Kreeblah (kreeblah)]

Well, at the time, I was getting errors about undeclared uses of methods. But, now that I'm trying again to get the specific error, I can't replicate that.

I'm also on a much newer version of clang, though, so apparently modern versions can build the 1.6 code as-is. I guess this doesn't need to be merged after all.

[Pali (pali)]

> Well, at the time, I was getting errors about undeclared uses of methods.

It would be nice to know which methods...

Would you be able to figure out which clang version has issue?

[Pali (pali)]

remove.c is calling strlen(), so string.h should be really included in remove.c

But common.h is included everywhere so hard to guess which file triggered compile error.

[Kreeblah (kreeblah)]

> Would you be able to figure out which clang version has issue?

Let me check and see. This might take me a bit to find out. Based on when I filed this, I expect I was on Xcode 13.2.1, which includes clang 13, however Apple doesn't always include libcxx versions that correspond with the same LLVM/clang versions, so I'll need to see what version of libcxx they included with that Xcode version.

[Pali (pali)]

I would like to ask, were you able to check it?

Unmerged revisions

140. By Kreeblah on 2023-11-19

macOS compilation fix

=== modified file 'common.h'
--- common.h	2016-12-13 00:09:12 +0000
+++ common.h	2023-11-19 23:36:38 +0000
@@ -26,6 +26,10 @@
 #define inline __inline__
 #endif
 
+#if defined(__APPLE__) && defined(__MACH__)
+#include <stdio.h>
+#endif
+
 /*********
  * Flags *
  *********/

=== modified file 'remove.c'
--- remove.c	2016-03-27 19:14:10 +0000
+++ remove.c	2023-11-19 23:36:38 +0000
@@ -19,6 +19,10 @@
 
 #include <StormLib.h>
 
+#if defined(__APPLE__) && defined(__MACH__)
+#include <string.h>
+#endif
+
 #include "common.h"
 
 int smpq_remove(const char * archive, const char * const files[], unsigned int flags, const char * listfile, unsigned int locale) {