mirror of
				https://github.com/samba-team/samba.git
				synced 2025-11-04 00:23:49 +03:00 
			
		
		
		
	r15573: Fix build of systems that have iconv headers in non-standard locations
Split of system/locale.h header from system/iconv.h Previously, iconv wasn't being used on these systems
This commit is contained in:
		
				
					committed by
					
						
						Gerald (Jerry) Carter
					
				
			
			
				
	
			
			
			
						parent
						
							d72c5c8f75
						
					
				
				
					commit
					aa6d66fda6
				
			@@ -24,7 +24,6 @@
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "includes.h"
 | 
			
		||||
#include "system/iconv.h"
 | 
			
		||||
#include "libcli/util/asn_1.h"
 | 
			
		||||
#include "libcli/ldap/ldap.h"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,6 @@
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "includes.h"
 | 
			
		||||
#include "system/iconv.h"
 | 
			
		||||
#include "libcli/util/asn_1.h"
 | 
			
		||||
#include "libcli/ldap/ldap.h"
 | 
			
		||||
#include "lib/ldb/include/ldb.h"
 | 
			
		||||
 
 | 
			
		||||
@@ -25,9 +25,9 @@
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "includes.h"
 | 
			
		||||
#include "system/iconv.h"
 | 
			
		||||
#include "librpc/gen_ndr/ndr_nbt.h"
 | 
			
		||||
#include "librpc/gen_ndr/ndr_misc.h"
 | 
			
		||||
#include "system/locale.h"
 | 
			
		||||
 | 
			
		||||
/* don't allow an unlimited number of name components */
 | 
			
		||||
#define MAX_COMPONENTS 10
 | 
			
		||||
 
 | 
			
		||||
@@ -21,9 +21,9 @@
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "includes.h"
 | 
			
		||||
#include "system/iconv.h"
 | 
			
		||||
#include "libcli/security/security.h"
 | 
			
		||||
#include "librpc/gen_ndr/ndr_misc.h"
 | 
			
		||||
#include "system/locale.h"
 | 
			
		||||
 | 
			
		||||
struct flag_map {
 | 
			
		||||
	const char *name;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user