rolled back the stdlib change so i can submit pr back to main.

rocketmark · rocketmark · commit cbb81ba2b952 · 2026-02-16T08:57:11.000-05:00
diff --git a/libs/cnkalman/src/kalman.c b/libs/cnkalman/src/kalman.c
@@ -1,7 +1,6 @@
 #include "cnkalman/kalman.h"
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 #include <cnkalman/kalman.h>
 #include <cnkalman/numerical_diff.h>
diff --git a/libs/cnmatrix/include/cnmatrix/cn_matrix.h b/libs/cnmatrix/include/cnmatrix/cn_matrix.h
@@ -21,8 +21,7 @@
 
 #include <stdbool.h>
 
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #include "cnmatrix/cn_flt.h"
 #include "math.h"
 #include "string.h"
diff --git a/libs/cnmatrix/src/cn_matrix.blas.c b/libs/cnmatrix/src/cn_matrix.blas.c
@@ -18,8 +18,7 @@
 
 #ifdef _WIN32
 #define SURVIVE_LOCAL_ONLY
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #define alloca _alloca
 #else
 #define SURVIVE_LOCAL_ONLY __attribute__((visibility("hidden")))
diff --git a/libs/cnmatrix/src/cn_matrix.c b/libs/cnmatrix/src/cn_matrix.c
@@ -5,8 +5,7 @@
 
 #ifdef _WIN32
 #define CN_LOCAL_ONLY
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #define alloca _alloca
 #else
 #define CN_LOCAL_ONLY __attribute__((visibility("hidden")))
diff --git a/redist/CNFGWinDriver.c b/redist/CNFGWinDriver.c
@@ -6,8 +6,7 @@
 #include <windows.h>
 #include <stdlib.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h> //for alloca
+#include <malloc.h> //for alloca
 #endif
 
 static HBITMAP lsBitmap;
diff --git a/redist/dirent.windows.h b/redist/dirent.windows.h
@@ -24,8 +24,7 @@
 #include <string.h>
 #include <stdlib.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/redist/json_helpers.c b/redist/json_helpers.c
@@ -9,7 +9,7 @@
 #include "json_helpers.h"
 #include <jsmn.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
+#include <malloc.h>
 #endif
 
 #ifdef _MSC_VER
diff --git a/redist/linmath.c b/redist/linmath.c
@@ -11,8 +11,7 @@
 #include <cnmatrix/cn_matrix.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 #include <assert.h>
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 
 #ifndef M_PI
diff --git a/redist/linmath.h b/redist/linmath.h
@@ -4,8 +4,7 @@
 #define _LINMATH_H
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/redist/lintest.c b/redist/lintest.c
@@ -5,8 +5,7 @@
 #endif
 #include <assert.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 #include <math.h>
 #include <stdbool.h>
diff --git a/redist/mpfit/mpfit.c b/redist/mpfit/mpfit.c
@@ -24,8 +24,7 @@
 #include <string.h>
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 
 /* Forward declarations of functions in this module */
diff --git a/src/barycentric_svd/barycentric_svd.c b/src/barycentric_svd/barycentric_svd.c
@@ -6,7 +6,7 @@
 #include "survive.h"
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 #include <cnmatrix/cn_matrix.h>
-#include <stdlib.h>
+#include <malloc.h>
 #endif
 
 static void bc_svd_choose_control_points(bc_svd *self) {
diff --git a/src/driver_vive.c b/src/driver_vive.c
@@ -10,8 +10,7 @@
 #include <sys/stat.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 #include <assert.h>
-#include <stdlib.h>
-#include <alloca.h> // for alloca
+#include <malloc.h> // for alloca
 
 #endif
 
diff --git a/src/lfsr.c b/src/lfsr.c
@@ -1,7 +1,7 @@
 #include "lfsr.h"
 #include <assert.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
+#include <malloc.h>
 #endif
 #include <stdbool.h>
 #include <survive.h>
diff --git a/src/lfsr_lh2.c b/src/lfsr_lh2.c
@@ -18,8 +18,7 @@ uint32_t inline clz(uint32_t value) {
 #include "stdio.h"
 #include "string.h"
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 
 lfsr_poly_t poly_pairs[32] = {
diff --git a/src/poser_barycentric_svd.c b/src/poser_barycentric_svd.c
@@ -2,7 +2,7 @@
 #include "cnmatrix/cn_matrix.h"
 #include "math.h"
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
+#include <malloc.h>
 #endif
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/poser_general_optimizer.c b/src/poser_general_optimizer.c
@@ -4,8 +4,7 @@
 
 #include <assert.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 #include <stdio.h>
 
diff --git a/src/poser_mpfit.c b/src/poser_mpfit.c
@@ -1,7 +1,7 @@
 #include "survive_optimizer.h"
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
+#include <malloc.h>
 #endif
 
 #include "mpfit/mpfit.h"
diff --git a/src/survive_config.c b/src/survive_config.c
@@ -6,8 +6,7 @@
 #if defined(__FreeBSD__) || defined(__APPLE__)
 #include <stdlib.h>
 #else
-#include <stdlib.h>
-#include <alloca.h> //for alloca
+#include <malloc.h> //for alloca
 #endif
 
 #include "ctype.h"
diff --git a/src/survive_kalman_tracker.c b/src/survive_kalman_tracker.c
@@ -9,7 +9,7 @@
 
 #include <assert.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
+#include <malloc.h>
 #endif
 #include <memory.h>
 #include <stddef.h>
diff --git a/src/survive_optimizer.c b/src/survive_optimizer.c
@@ -19,8 +19,7 @@
 
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 #include <cnmatrix/cn_matrix.h>
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 
 #endif
 
diff --git a/src/test_cases/test_replays.c b/src/test_cases/test_replays.c
@@ -4,8 +4,7 @@
 
 #include <complex.h>
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 #include <math.h>
 #include <os_generic.h>
diff --git a/survive-solver.c b/survive-solver.c
@@ -1,6 +1,5 @@
 #if !defined(__FreeBSD__) && !defined(__APPLE__)
-#include <stdlib.h>
-#include <alloca.h>
+#include <malloc.h>
 #endif
 
 #include "src/survive_default_devices.h"
diff --git a/useful_files/generic_test.c b/useful_files/generic_test.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <inttypes.h>
-#include <stdlib.h>
+#include <malloc.h>
 #include <math.h>
 #include <stdbool.h>
 #include <stdint.h>
