Changed __builtin_choose_expr to ternary expression to allow dynamic-…

…length array types
Snaipe · Jun 8, 2015 · 44e6737 · 44e6737
1 parent 64c73a1
commit 44e6737
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/include/csptr/smart_ptr.h b/include/csptr/smart_ptr.h
@@ -53,11 +53,10 @@ inline void sfree_stack(void *ptr) {
             Args                                                            \
         };                                                                  \
         const __typeof__(Type[1]) dummy;                                    \
-        void *var =                                                         \
-            __builtin_choose_expr(sizeof (dummy[0]) == sizeof (dummy),      \
-                smalloc(sizeof (Type), 0, Kind, ARGS_),                     \
-                smalloc(sizeof (dummy[0]),                                  \
-                    sizeof (dummy) / sizeof (dummy[0]), Kind, ARGS_));      \
+        void *var = sizeof (dummy[0]) == sizeof (dummy)                     \
+            ? smalloc(sizeof (Type), 0, Kind, ARGS_)                        \
+            : smalloc(sizeof (dummy[0]),                                    \
+                    sizeof (dummy) / sizeof (dummy[0]), Kind, ARGS_);       \
         if (var != NULL)                                                    \
             memcpy(var, &args.value, sizeof (Type));                        \
         var;                                                                \