mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-02 11:03:57 +00:00
571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
28 lines
822 B
Diff
28 lines
822 B
Diff
diff --git a/src/malloc.h b/src/malloc.h
|
|
index cc4d3bf..bbf78cd 100644
|
|
--- a/src/malloc.h
|
|
+++ b/src/malloc.h
|
|
@@ -34,6 +34,10 @@ extern int low_memory_warning;
|
|
# define realloc(ptr, size) mrealloc(NULL, ptr, size)
|
|
# define free(ptr) mfree(NULL, ptr)
|
|
#else
|
|
+#ifdef __APPLE__
|
|
+ #include <stdlib.h>
|
|
+ #include <sys/types.h>
|
|
+#endif
|
|
# define mmalloc(md, size) malloc(size)
|
|
# define mcalloc(md, size) calloc(size)
|
|
# define mrealloc(md, ptr, size) realloc(ptr, size)
|
|
diff --git a/src/tfio.c b/src/tfio.c
|
|
index 2cd2103..8640f2b 100644
|
|
--- a/src/tfio.c
|
|
+++ b/src/tfio.c
|
|
@@ -70,6 +70,7 @@ static void fileputs(const char *str, FILE *fp);
|
|
static void filenputs(const char *str, int n, FILE *fp);
|
|
static void queueputline(conString *line, TFILE *file);
|
|
|
|
+extern void main_loop(void);
|
|
|
|
void init_tfio(void)
|
|
{
|