mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* process.c (OBJ2UID1): Defined even if getpwnam_r is not usable.
(OBJ2GID1): Defined even if getgrnam_r is not usable. This fixes compilation error on Android. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									2291ff2eaa
								
							
						
					
					
						commit
						960c8ab125
					
				
					 2 changed files with 10 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -1,3 +1,9 @@
 | 
			
		|||
Wed Apr  9 21:02:04 2014  Tanaka Akira  <akr@fsij.org>
 | 
			
		||||
 | 
			
		||||
	* process.c (OBJ2UID1): Defined even if getpwnam_r is not usable.
 | 
			
		||||
	  (OBJ2GID1): Defined even if getgrnam_r is not usable.
 | 
			
		||||
	  This fixes compilation error on Android.
 | 
			
		||||
 | 
			
		||||
Wed Apr  9 15:16:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* encoding.c (rb_enc_default_internal): fix rdoc.  `__FILE__` is
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -175,12 +175,14 @@ obj2uid0(VALUE id)
 | 
			
		|||
# else
 | 
			
		||||
#   define PREPARE_GETPWNAM	/* do nothing */
 | 
			
		||||
#   define FINISH_GETPWNAM	/* do nothing */
 | 
			
		||||
#   define OBJ2UID1(id) obj2uid((id))
 | 
			
		||||
#   define OBJ2UID(id) obj2uid((id))
 | 
			
		||||
static rb_uid_t obj2uid(VALUE id);
 | 
			
		||||
# endif
 | 
			
		||||
#else
 | 
			
		||||
# define PREPARE_GETPWNAM	/* do nothing */
 | 
			
		||||
# define FINISH_GETPWNAM	/* do nothing */
 | 
			
		||||
# define OBJ2UID1(id) NUM2UIDT(id)
 | 
			
		||||
# define OBJ2UID(id) NUM2UIDT(id)
 | 
			
		||||
# ifdef p_uid_from_name
 | 
			
		||||
#   undef p_uid_from_name
 | 
			
		||||
| 
						 | 
				
			
			@ -216,12 +218,14 @@ static rb_gid_t obj2gid(VALUE id, VALUE *getgr_buf);
 | 
			
		|||
# else
 | 
			
		||||
#   define PREPARE_GETGRNAM	/* do nothing */
 | 
			
		||||
#   define FINISH_GETGRNAM	/* do nothing */
 | 
			
		||||
#   define OBJ2GID1(id) obj2gid((id))
 | 
			
		||||
#   define OBJ2GID(id) obj2gid((id))
 | 
			
		||||
static rb_gid_t obj2gid(VALUE id);
 | 
			
		||||
# endif
 | 
			
		||||
#else
 | 
			
		||||
# define PREPARE_GETGRNAM	/* do nothing */
 | 
			
		||||
# define FINISH_GETGRNAM	/* do nothing */
 | 
			
		||||
# define OBJ2GID1(id) NUM2GIDT(id)
 | 
			
		||||
# define OBJ2GID(id) NUM2GIDT(id)
 | 
			
		||||
# ifdef p_gid_from_name
 | 
			
		||||
#   undef p_gid_from_name
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue