Merge pull request #5107 from WalterBright/fixosx32

fix OSX 32 build
dlang · Sep 22, 2015 · b6e5152 · b6e5152
2 parents 26bd745 + 31e72fa
commit b6e5152
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/backend.d b/src/backend.d
@@ -61,7 +61,7 @@ extern extern (C++) type* type_dyn_array(type* tnext);
 extern extern (C) type* type_static_array(targ_size_t dim, type* tnext);
 extern extern (C++) type* type_assoc_array(type* tkey, type* tvalue);
 extern extern (C++) type* type_delegate(type* tnext);
-extern extern (C++) type* type_function(tym_t tyf, type** ptypes, size_t nparams, bool variadic, type* tret);
+extern extern (C) type* type_function(tym_t tyf, type** ptypes, size_t nparams, bool variadic, type* tret);
 extern extern (C++) type* type_enum(const(char)* name, type* tbase);
 extern extern (C++) type* type_struct_class(const(char)* name, uint alignsize, uint structsize,
     type* arg1type, type* arg2type, bool isUnion, bool isClass, bool isPOD);

diff --git a/src/backend/type.c b/src/backend/type.c
@@ -435,6 +435,8 @@ type *type_delegate(type *tnext)
  * Returns:
  *      Tcount already incremented
  */
+extern "C" // because of size_t on OSX 32
+{
 type *type_function(tym_t tyf, type **ptypes, size_t nparams, bool variadic, type *tret)
 {
     param_t *paramtypes = NULL;
@@ -450,6 +452,7 @@ type *type_function(tym_t tyf, type **ptypes, size_t nparams, bool variadic, typ
     t->Tcount++;
     return t;
 }
+}
 
 /***************************************
  * Create an enum type.

diff --git a/src/backend/type.h b/src/backend/type.h
@@ -206,7 +206,7 @@ type *type_dyn_array(type *tnext);
 extern "C" type *type_static_array(targ_size_t dim, type *tnext);
 type *type_assoc_array(type *tkey, type *tvalue);
 type *type_delegate(type *tnext);
-type *type_function(tym_t tyf, type **ptypes, size_t nparams, bool variadic, type *tret);
+extern "C" type *type_function(tym_t tyf, type **ptypes, size_t nparams, bool variadic, type *tret);
 type *type_enum(const char *name, type *tbase);
 type *type_struct_class(const char *name, unsigned alignsize, unsigned structsize,
         type *arg1type, type *arg2type, bool isUnion, bool isClass, bool isPOD);