Bladeren bron

darwin/mac os x fixes:
- no sigwaitinfo => use sigwait (in libc)
- warning fix

Andrei Pelinescu-Onciul 19 jaren geleden
bovenliggende
commit
6c006f793e
2 gewijzigde bestanden met toevoegingen van 4 en 1 verwijderingen
  1. 2 1
      Makefile.defs
  2. 2 0
      mem/shm_mem.c

+ 2 - 1
Makefile.defs

@@ -1159,7 +1159,8 @@ ifeq ($(OS), darwin)
 	DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \
 		-DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \
 		-DUSE_ANON_MMAP \
-		-DNDEBUG -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM
+		-DNDEBUG -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \
+		-DUSE_SIGWAIT
 	# -DNDEBUG used to turn off assert (assert wants to call
 	# eprintf which doesn't seem to be defined in any shared lib
 	ifneq ($(found_lock_method), yes)

+ 2 - 0
mem/shm_mem.c

@@ -128,7 +128,9 @@ int shm_getmem()
 {
 
 #ifdef SHM_MMAP
+#ifndef USE_ANON_MMAP
 	int fd;
+#endif
 #else
 	struct shmid_ds shm_info;
 #endif