am 307aadb8: Merge "libc: Add missing C++ guards to <pathconf.h>" into gingerbread
				
					
				
			Merge commit '307aadb8473744c3d946add8b3e4947ada5481aa' into gingerbread-plus-aosp * commit '307aadb8473744c3d946add8b3e4947ada5481aa': libc: Add missing C++ guards to <pathconf.h>
This commit is contained in:
		
				
					committed by
					
						
						Android Git Automerger
					
				
			
			
				
	
			
			
			
					commit
					5b5212b457
				
			@@ -28,6 +28,10 @@
 | 
				
			|||||||
#ifndef _PATHCONF_H_
 | 
					#ifndef _PATHCONF_H_
 | 
				
			||||||
#define _PATHCONF_H_
 | 
					#define _PATHCONF_H_
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include <sys/cdefs.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					__BEGIN_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* constants to be used for the 'name' paremeter of pathconf/fpathconf */
 | 
					/* constants to be used for the 'name' paremeter of pathconf/fpathconf */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define  _PC_FILESIZEBITS       0x0000
 | 
					#define  _PC_FILESIZEBITS       0x0000
 | 
				
			||||||
@@ -54,5 +58,7 @@
 | 
				
			|||||||
extern long fpathconf(int fildes, int name);
 | 
					extern long fpathconf(int fildes, int name);
 | 
				
			||||||
extern long pathconf(const char *path, int name);
 | 
					extern long pathconf(const char *path, int name);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					__END_DECLS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif /* _PATHCONF_H_ */
 | 
					#endif /* _PATHCONF_H_ */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user