am 398ef152: Merge "Move endpwent to ndk_cruft.cpp."
				
					
				
			* commit '398ef152d50854fccb21086e30b5cc24641b3e2a': Move endpwent to ndk_cruft.cpp.
This commit is contained in:
		@@ -358,3 +358,6 @@ extern "C" void setusershell() { }
 | 
			
		||||
 | 
			
		||||
// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
 | 
			
		||||
extern "C" void endusershell() { }
 | 
			
		||||
 | 
			
		||||
// This is never implemented in bionic, only needed for ABI compatibility with the NDK.
 | 
			
		||||
extern "C" void endpwent() { }
 | 
			
		||||
 
 | 
			
		||||
@@ -446,18 +446,6 @@ protoent* getprotobynumber(int /*proto*/) {
 | 
			
		||||
  return NULL;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static void unimplemented_stub(const char* function) {
 | 
			
		||||
  const char* fmt = "%s(3) is not implemented on Android\n";
 | 
			
		||||
  __libc_format_log(ANDROID_LOG_WARN, "libc", fmt, function);
 | 
			
		||||
  fprintf(stderr, fmt, function);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#define UNIMPLEMENTED unimplemented_stub(__PRETTY_FUNCTION__)
 | 
			
		||||
 | 
			
		||||
void endpwent() {
 | 
			
		||||
  UNIMPLEMENTED;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Portable code should use sysconf(_SC_PAGE_SIZE) directly instead.
 | 
			
		||||
int getpagesize() {
 | 
			
		||||
  // We dont use sysconf(3) here because that drags in stdio, which makes static binaries fat.
 | 
			
		||||
 
 | 
			
		||||
@@ -119,10 +119,6 @@ struct passwd* getpwuid(uid_t);
 | 
			
		||||
int getpwnam_r(const char*, struct passwd*, char*, size_t, struct passwd**);
 | 
			
		||||
int getpwuid_r(uid_t, struct passwd*, char*, size_t, struct passwd**);
 | 
			
		||||
 | 
			
		||||
void endpwent(void);
 | 
			
		||||
struct passwd* getpwent(void);
 | 
			
		||||
int setpwent(void);
 | 
			
		||||
 | 
			
		||||
__END_DECLS
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user