Ticket #53122: patch-missing-prototypes.diff

decryptionresult.cpp

@@ -37 +37 @@
 #include <istream>
 
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 class GpgME::DecryptionResult::Private
 {

encryptionresult.cpp

@@ -37 +37 @@
 #include <iterator>
 
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 class GpgME::EncryptionResult::Private
 {

importresult.cpp

@@ -33 +33 @@
 #include <cstring>
 
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 class GpgME::ImportResult::Private
 {

keygenerationresult.cpp

@@ -33 +33 @@
 #include <cstdlib>
 
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 class GpgME::KeyGenerationResult::Private
 {

signingresult.cpp

@@ -37 +37 @@
 #include <iterator>
 
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 class GpgME::SigningResult::Private
 {

swdbresult.cpp

@@ -31 +31 @@
 
 #include "gpgme.h"
 
+#include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
+
 class GpgME::SwdbResult::Private
 {
 public:

lang/cpp/src/

@@ -28 +28 @@
 #include <istream>
 #include "util.h"
 
+#include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
+
 class GpgME::TofuInfo::Private
 {
 public:

verificationresult.cpp

@@ -41 +41 @@
 #include <cstdlib>
 
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 class GpgME::VerificationResult::Private
 {

vfsmountresult.cpp

@@ -32 +32 @@
 
 #include <istream>
 #include <string.h>
+// string.h only declares strdup() if __DARWIN_C_LEVEL >= 200112L. 
+// Don't mess with that macro, just provide the prototype:
+extern "C" {
+extern char *strdup(const char *);
+}
 
 using namespace GpgME;
 

lang/qt/src/

@@ -37 +37 @@
 
 #include "dn.h"
 
+#include <strings.h>
+
 static const struct {
     const char *name;
     const char *oid;
@@ -165 +167 @@
     for (unsigned int i = 0; i < numOidMaps; ++i)
         if (!strcasecmp((char *)p, oidmap[i].oid)) {
             free(p);
-            p = strdup(oidmap[i].name);
+            p = qstrdup(oidmap[i].name);
             break;
         }
     array->key = p;

lang/qt/tests/

@@ -42 +42 @@
     char *getPassphrase(const char * /*useridHint*/, const char * /*description*/,
                         bool /*previousWasBad*/, bool &/*canceled*/) Q_DECL_OVERRIDE
     {
-        return strdup("abc");
+        return qstrdup("abc");
     }
 };
 } // namespace GpgME