Actually finished using the real apr_getopt API.

[cycript.git] / sig / parse.cpp

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 3452e5a3159bd2046cd332904e24b6d1fd967111..a359e5419c097990f422d829d5740c916787ff15 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -43,7 +43,7 @@
 
 #include "minimal/stdlib.h"
 
-#include <apr-1/apr_strings.h>
+#include <apr_strings.h>
 
 #include <string.h>
 
@@ -160,13 +160,13 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
 
         case '^':
             type->primitive = pointer_P;
-            if (**name == 'v') {
-                type->data.data.type = NULL;
-                ++*name;
-            } else if (**name == '"') {
+            if (**name == '"') {
                 type->data.data.type = NULL;
             } else {
                 type->data.data.type = Parse_(pool, name, eos, named, callback);
+                sig::Type *&target(type->data.data.type);
+                if (target != NULL && target->primitive == void_P)
+                    target = NULL;
             }
         break;