mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	A few MacOS X portability fixes
Based on patches contributed by "Tron". See bug #478.
This commit is contained in:
		
							parent
							
								
									9f39a44488
								
							
						
					
					
						commit
						04c3c6716b
					
				
					 2 changed files with 11 additions and 3 deletions
				
			
		| 
						 | 
					@ -88,6 +88,10 @@
 | 
				
			||||||
#include <samplerate.h>
 | 
					#include <samplerate.h>
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef __APPLE__
 | 
				
			||||||
 | 
					#include <xlocale.h>
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <pulse/xmalloc.h>
 | 
					#include <pulse/xmalloc.h>
 | 
				
			||||||
#include <pulse/util.h>
 | 
					#include <pulse/util.h>
 | 
				
			||||||
#include <pulse/utf8.h>
 | 
					#include <pulse/utf8.h>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,6 +27,13 @@
 | 
				
			||||||
#include <locale.h>
 | 
					#include <locale.h>
 | 
				
			||||||
#include <dlfcn.h>
 | 
					#include <dlfcn.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef __APPLE__
 | 
				
			||||||
 | 
					#include <crt_externs.h>
 | 
				
			||||||
 | 
					#define environ (*_NSGetEnviron())
 | 
				
			||||||
 | 
					#elif !HAVE_DECL_ENVIRON
 | 
				
			||||||
 | 
					extern char **environ;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <pulse/proplist.h>
 | 
					#include <pulse/proplist.h>
 | 
				
			||||||
#include <pulse/utf8.h>
 | 
					#include <pulse/utf8.h>
 | 
				
			||||||
#include <pulse/xmalloc.h>
 | 
					#include <pulse/xmalloc.h>
 | 
				
			||||||
| 
						 | 
					@ -37,9 +44,6 @@
 | 
				
			||||||
#include "proplist-util.h"
 | 
					#include "proplist-util.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void pa_init_proplist(pa_proplist *p) {
 | 
					void pa_init_proplist(pa_proplist *p) {
 | 
				
			||||||
#if !HAVE_DECL_ENVIRON
 | 
					 | 
				
			||||||
    extern char **environ;
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
    char **e;
 | 
					    char **e;
 | 
				
			||||||
    const char *pp;
 | 
					    const char *pp;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue