mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-04 05:15:22 +00:00 
			
		
		
		
	Change define __OSX__ to more appropriate __Darwin__ (in light of Darwin being open sourced, and able to run on x86, OSX isn't really suitable)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -244,7 +244,7 @@ LIBS+=-lresolv  #-lnjamd
 | 
			
		||||
endif
 | 
			
		||||
ifeq (${OSARCH},Darwin)
 | 
			
		||||
LIBS+=-lresolv
 | 
			
		||||
CFLAGS+=-D__OSX__
 | 
			
		||||
CFLAGS+=-D__Darwin__
 | 
			
		||||
endif
 | 
			
		||||
ifeq (${OSARCH},FreeBSD)
 | 
			
		||||
LIBS+=-lcrypto
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								config.c
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								config.c
									
									
									
									
									
								
							@@ -19,7 +19,7 @@
 | 
			
		||||
#include <time.h>
 | 
			
		||||
#define AST_INCLUDE_GLOB 1
 | 
			
		||||
#ifdef AST_INCLUDE_GLOB
 | 
			
		||||
#ifdef __OSX__
 | 
			
		||||
#ifdef __Darwin__
 | 
			
		||||
#define GLOB_ABORTED GLOB_ABEND
 | 
			
		||||
#endif
 | 
			
		||||
# include <glob.h>
 | 
			
		||||
 
 | 
			
		||||
@@ -38,7 +38,7 @@
 | 
			
		||||
#include <sys/socket.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <errno.h>
 | 
			
		||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__OSX__)
 | 
			
		||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(SOLARIS) || defined(__Darwin__)
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
#include <netinet/in_systm.h>
 | 
			
		||||
#endif
 | 
			
		||||
@@ -46,7 +46,7 @@
 | 
			
		||||
#include <sys/ioctl.h>
 | 
			
		||||
#include <netinet/in.h>
 | 
			
		||||
#include <net/if.h>
 | 
			
		||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__OSX__)
 | 
			
		||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__)
 | 
			
		||||
#include <net/if_dl.h>
 | 
			
		||||
#include <ifaddrs.h>
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user