Remove warnings from amalgamation header

jart · Aug 19, 2022 · fcbf64b · fcbf64b
1 parent 283fd9e
commit fcbf64b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/libc/mem/mem.h b/libc/mem/mem.h
@@ -23,7 +23,7 @@ void *valloc(size_t) attributeallocsize((1)) vallocesque;
 void *pvalloc(size_t) vallocesque;
 char *strdup(const char *) paramsnonnull() mallocesque;
 char *strndup(const char *, size_t) paramsnonnull() mallocesque;
-void *aligned_alloc(size_t, size_t) attributeallocsize((1))
+void *aligned_alloc(size_t, size_t) attributeallocalign((1))
     attributeallocsize((2)) returnspointerwithnoaliases libcesque dontdiscard;
 int posix_memalign(void **, size_t, size_t);
 bool __grow(void *, size_t *, size_t, size_t) paramsnonnull((1, 2)) libcesque;

diff --git a/libc/sysv/consts/_posix.h b/libc/sysv/consts/_posix.h
@@ -52,8 +52,4 @@
 #define _POSIX2_LINE_MAX           2048
 #define _POSIX2_RE_DUP_MAX         255
 
-#define _XOPEN_IOV_MAX  16
-#define _XOPEN_NAME_MAX 255
-#define _XOPEN_PATH_MAX 1024
-
 #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS__POSIX_H_ */
diff --git a/libc/sysv/consts/xopen.h b/libc/sysv/consts/xopen.h
@@ -1,12 +1,11 @@
 #ifndef COSMOPOLITAN_LIBC_SYSV_CONSTS_XOPEN_H_
 #define COSMOPOLITAN_LIBC_SYSV_CONSTS_XOPEN_H_
 
-#define _XOPEN_IOV_MAX  0x10
+#define _XOPEN_IOV_MAX  16
 #define _XOPEN_ENH_I18N 1
 #define _XOPEN_UNIX     1
 #define _XOPEN_NAME_MAX 63
-#define _XOPEN_PATH_MAX 255
-#define _XOPEN_VERSION  700
+#define _XOPEN_PATH_MAX 1024
 #define _XOPEN_SOURCE   700
 
 #endif /* COSMOPOLITAN_LIBC_SYSV_CONSTS_XOPEN_H_ */
diff --git a/test/libc/release/test.mk b/test/libc/release/test.mk
@@ -7,6 +7,7 @@ o/$(MODE)/test/libc/release/cosmopolitan.zip:			\
 		o/$(MODE)/ape/ape.lds				\
 		o/$(MODE)/libc/crt/crt.o			\
 		o/$(MODE)/ape/ape.o				\
+		o/$(MODE)/ape/ape-copy-self.o			\
 		o/$(MODE)/ape/ape-no-modify-self.o		\
 		o/$(MODE)/cosmopolitan.a
 	mkdir -p $(@D)
@@ -15,6 +16,7 @@ o/$(MODE)/test/libc/release/cosmopolitan.zip:			\
 		o/$(MODE)/ape/ape.lds				\
 		o/$(MODE)/libc/crt/crt.o			\
 		o/$(MODE)/ape/ape.o				\
+		o/$(MODE)/ape/ape-copy-self.o			\
 		o/$(MODE)/ape/ape-no-modify-self.o		\
 		o/$(MODE)/cosmopolitan.a