From 3ba5f71e1b1343e339cd52b91dea3ea2e8db7775 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 18 Apr 2009 14:10:06 +0000
Subject: * ext/readline/readline.c: use rb_f_notimplement for methods not  
 implemented.

* ext/openssl/ossl_engine.c: ditto.

* ext/openssl/ossl_config.c: ditto.

* ext/openssl/ossl_cipher.c: ditto.

* ext/openssl/ossl_pkcs5.c: ditto.

* ext/openssl/ossl_x509ext.c: ditto.

* ext/socket/socket.c: ditto.

* ext/socket/basicsocket.c: ditto.

* ext/socket/ancdata.c: ditto.

* ext/socket/unixsocket.c: ditto.

* ext/iconv/iconv.c: ditto.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/basicsocket.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'ext/socket/basicsocket.c')

diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 78e675c0d..4ffbd497b 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -244,6 +244,7 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
     return INT2FIX(0);
 }
 
+#if !defined(__BEOS__)
 /*
  * Document-method: getsockopt
  * call-seq: getsockopt(level, optname)
@@ -287,7 +288,6 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
 static VALUE
 bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
 {
-#if !defined(__BEOS__)
     int level, option;
     socklen_t len;
     char *buf;
@@ -307,10 +307,10 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
 	rb_sys_fail_path(fptr->pathv);
 
     return rsock_sockopt_new(family, level, option, rb_str_new(buf, len));
+}
 #else
-    rb_notimplement();
+#define bsock_getsockopt rb_f_notimplement
 #endif
-}
 
 /*
  * call-seq:
@@ -361,6 +361,7 @@ bsock_getpeername(VALUE sock)
     return rb_str_new((char*)&buf, len);
 }
 
+#if defined(HAVE_GETPEEREID) || defined(SO_PEERCRED) || defined(HAVE_GETPEERUCRED)
 /*
  * call-seq:
  *   basicsocket.getpeereid => [euid, egid]
@@ -412,10 +413,11 @@ bsock_getpeereid(VALUE self)
     ret = rb_assoc_new(UIDT2NUM(ucred_geteuid(uc)), GIDT2NUM(ucred_getegid(uc)));
     ucred_free(uc);
     return ret;
-#else
-    rb_notimplement();
 #endif
 }
+#else
+#define bsock_getpeereid rb_f_notimplement
+#endif
 
 /*
  * call-seq:
-- 
cgit