eventmachine 0.12.8-x86-mswin32-60 → 0.12.10-x86-mswin32-60

data/ext/em.h

@@ -34,8 +34,16 @@ See the file COPYING for complete licensing information.
   #include <ruby.h>
   #define EmSelect rb_thread_select
 
-  #ifdef HAVE_RBTRAP
+  #if defined(HAVE_RBTRAP)
     #include <rubysig.h>
+  #elif defined(HAVE_RB_THREAD_CHECK_INTS)
+    extern "C" {
+      void rb_enable_interrupt(void);
+      void rb_disable_interrupt(void);
+    }
+
+    #define TRAP_BEG rb_enable_interrupt()
+    #define TRAP_END do { rb_disable_interrupt(); rb_thread_check_ints(); } while(0)
   #else
     #define TRAP_BEG
     #define TRAP_END
@@ -74,28 +82,28 @@ class EventMachine_t
 		static void SetMaxTimerCount (int);
 
 	public:
-		EventMachine_t (void(*event_callback)(const char*, int, const char*, int));
+		EventMachine_t (void(*event_callback)(const unsigned long, int, const char*, const unsigned long));
 		virtual ~EventMachine_t();
 
 		void Run();
 		void ScheduleHalt();
 		void SignalLoopBreaker();
-		const char *InstallOneshotTimer (int);
-		const char *ConnectToServer (const char *, int, const char *, int);
-		const char *ConnectToUnixServer (const char *);
-
-		const char *CreateTcpServer (const char *, int);
-		const char *OpenDatagramSocket (const char *, int);
-		const char *CreateUnixDomainServer (const char*);
-		const char *_OpenFileForWriting (const char*);
-		const char *OpenKeyboard();
+		const unsigned long InstallOneshotTimer (int);
+		const unsigned long ConnectToServer (const char *, int, const char *, int);
+		const unsigned long ConnectToUnixServer (const char *);
+
+		const unsigned long CreateTcpServer (const char *, int);
+		const unsigned long OpenDatagramSocket (const char *, int);
+		const unsigned long CreateUnixDomainServer (const char*);
+		const unsigned long _OpenFileForWriting (const char*);
+		const unsigned long OpenKeyboard();
 		//const char *Popen (const char*, const char*);
-		const char *Socketpair (char* const*);
+		const unsigned long Socketpair (char* const*);
 
 		void Add (EventableDescriptor*);
 		void Modify (EventableDescriptor*);
 
-		const char *AttachFD (int, bool, bool);
+		const unsigned long AttachFD (int, bool);
 		int DetachFD (EventableDescriptor*);
 
 		void ArmKqueueWriter (EventableDescriptor*);
@@ -112,18 +120,18 @@ class EventMachine_t
 		float GetHeartbeatInterval();
 		int SetHeartbeatInterval(float);
 
-		const char *WatchFile (const char*);
+		const unsigned long WatchFile (const char*);
 		void UnwatchFile (int);
-		void UnwatchFile (const char*);
+		void UnwatchFile (const unsigned long);
 
 		#ifdef HAVE_KQUEUE
 		void _HandleKqueueFileEvent (struct kevent*);
 		void _RegisterKqueueFileEvent(int);
 		#endif
 
-		const char *WatchPid (int);
+		const unsigned long WatchPid (int);
 		void UnwatchPid (int);
-		void UnwatchPid (const char *);
+		void UnwatchPid (const unsigned long);
 
 		#ifdef HAVE_KQUEUE
 		void _HandleKqueuePidEvent (struct kevent*);
@@ -160,7 +168,7 @@ class EventMachine_t
 			MaxEvents = 4096
 		};
 		int HeartbeatInterval;
-		void (*EventCallback)(const char*, int, const char*, int);
+		void (*EventCallback)(const unsigned long, int, const char*, const unsigned long);
 
 		class Timer_t: public Bindable_t {
 		};
@@ -212,6 +220,7 @@ struct SelectData_t
 	int maxsocket;
 	fd_set fdreads;
 	fd_set fdwrites;
+	fd_set fderrors;
 	timeval tv;
 	int nSockets;
 };

data/ext/emwin.cpp

@@ -138,7 +138,7 @@ bool EventMachine_t::_RunTimers()
 		if (i->first > gCurrentLoopTime)
 			break;
 		if (EventCallback)
-			(*EventCallback) ("", EM_TIMER_FIRED, i->second.GetBinding().c_str(), i->second.GetBinding().length());
+			(*EventCallback) (NULL, EM_TIMER_FIRED, NULL, i->second.GetBinding());
 		Timers.erase (i);
 	}
 	return true;
@@ -158,7 +158,7 @@ const char *EventMachine_t::InstallOneshotTimer (int seconds)
 
 	Timer_t t;
 	Timers.insert (make_pair (time(NULL) + seconds, t));
-	return t.GetBinding().c_str();
+	return t.GetBinding();
 }
 
 
@@ -230,7 +230,7 @@ const char *EventMachine_t::CreateTcpServer (const char *server, int port)
 		if (!ad)
 			throw std::runtime_error ("unable to allocate acceptor");
 		Add (ad);
-		output_binding = ad->GetBinding().c_str();
+		output_binding = ad->GetBinding();
 
 		CreateIoCompletionPort ((HANDLE)sd_accept, Iocp, NULL, 0);
 		SOCKET sd = socket (AF_INET, SOCK_STREAM, 0);

data/ext/eventmachine.h

@@ -39,43 +39,54 @@ extern "C" {
 
 	};
 
-	void evma_initialize_library (void(*)(const char*, int, const char*, int));
+	void evma_initialize_library (void(*)(const unsigned long, int, const char*, const unsigned long));
 	void evma_run_machine();
 	void evma_release_library();
-	const char *evma_install_oneshot_timer (int seconds);
-	const char *evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
-	const char *evma_connect_to_unix_server (const char *server);
-
-	const char *evma_attach_fd (int file_descriptor, int read_mode, int write_mode);
-	int evma_detach_fd (const char *binding);
-
-	void evma_stop_tcp_server (const char *signature);
-	const char *evma_create_tcp_server (const char *address, int port);
-	const char *evma_create_unix_domain_server (const char *filename);
-	const char *evma_open_datagram_socket (const char *server, int port);
-	const char *evma_open_keyboard();
-	void evma_set_tls_parms (const char *binding, const char *privatekey_filename, const char *certchain_filenane, int verify_peer);
-	void evma_start_tls (const char *binding);
+	const unsigned long evma_install_oneshot_timer (int seconds);
+	const unsigned long evma_connect_to_server (const char *bind_addr, int bind_port, const char *server, int port);
+	const unsigned long evma_connect_to_unix_server (const char *server);
+
+	const unsigned long evma_attach_fd (int file_descriptor, int watch_mode);
+	int evma_detach_fd (const unsigned long binding);
+	int evma_get_file_descriptor (const unsigned long binding);
+	int evma_is_notify_readable (const unsigned long binding);
+	void evma_set_notify_readable (const unsigned long binding, int mode);
+	int evma_is_notify_writable (const unsigned long binding);
+	void evma_set_notify_writable (const unsigned long binding, int mode);
+
+	int evma_pause(const unsigned long binding);
+	int evma_is_paused(const unsigned long binding);
+	int evma_resume(const unsigned long binding);
+
+	void evma_stop_tcp_server (const unsigned long signature);
+	const unsigned long evma_create_tcp_server (const char *address, int port);
+	const unsigned long evma_create_unix_domain_server (const char *filename);
+	const unsigned long evma_open_datagram_socket (const char *server, int port);
+	const unsigned long evma_open_keyboard();
+	void evma_set_tls_parms (const unsigned long binding, const char *privatekey_filename, const char *certchain_filenane, int verify_peer);
+	void evma_start_tls (const unsigned long binding);
 
 	#ifdef WITH_SSL
-	X509 *evma_get_peer_cert (const char *binding);
-	void evma_accept_ssl_peer (const char *binding);
+	X509 *evma_get_peer_cert (const unsigned long binding);
+	void evma_accept_ssl_peer (const unsigned long binding);
 	#endif
 
-	int evma_get_peername (const char *binding, struct sockaddr*);
-	int evma_get_sockname (const char *binding, struct sockaddr*);
-	int evma_get_subprocess_pid (const char *binding, pid_t*);
-	int evma_get_subprocess_status (const char *binding, int*);
+	int evma_get_peername (const unsigned long binding, struct sockaddr*);
+	int evma_get_sockname (const unsigned long binding, struct sockaddr*);
+	int evma_get_subprocess_pid (const unsigned long binding, pid_t*);
+	int evma_get_subprocess_status (const unsigned long binding, int*);
 	int evma_get_connection_count();
-	int evma_send_data_to_connection (const char *binding, const char *data, int data_length);
-	int evma_send_datagram (const char *binding, const char *data, int data_length, const char *address, int port);
-	float evma_get_comm_inactivity_timeout (const char *binding);
-	int evma_set_comm_inactivity_timeout (const char *binding, float value);
-	int evma_get_outbound_data_size (const char *binding);
-	int evma_send_file_data_to_connection (const char *binding, const char *filename);
-
-	void evma_close_connection (const char *binding, int after_writing);
-	int evma_report_connection_error_status (const char *binding);
+	int evma_send_data_to_connection (const unsigned long binding, const char *data, int data_length);
+	int evma_send_datagram (const unsigned long binding, const char *data, int data_length, const char *address, int port);
+	float evma_get_comm_inactivity_timeout (const unsigned long binding);
+	int evma_set_comm_inactivity_timeout (const unsigned long binding, float value);
+	float evma_get_pending_connect_timeout (const unsigned long binding);
+	int evma_set_pending_connect_timeout (const unsigned long binding, float value);
+	int evma_get_outbound_data_size (const unsigned long binding);
+	int evma_send_file_data_to_connection (const unsigned long binding, const char *filename);
+
+	void evma_close_connection (const unsigned long binding, int after_writing);
+	int evma_report_connection_error_status (const unsigned long binding);
 	void evma_signal_loopbreak();
 	void evma_set_timer_quantum (int);
 	int evma_get_max_timer_count();
@@ -85,17 +96,17 @@ extern "C" {
 	float evma_get_heartbeat_interval();
 	int evma_set_heartbeat_interval(float);
 
-	const char *evma__write_file (const char *filename);
-	const char *evma_popen (char * const*cmd_strings);
+	const unsigned long evma__write_file (const char *filename);
+	const unsigned long evma_popen (char * const*cmd_strings);
 
-	const char *evma_watch_filename (const char *fname);
-	void evma_unwatch_filename (const char *sig);
+	const unsigned long evma_watch_filename (const char *fname);
+	void evma_unwatch_filename (const unsigned long);
 
-	const char *evma_watch_pid (int);
-	void evma_unwatch_pid (const char *sig);
+	const unsigned long evma_watch_pid (int);
+	void evma_unwatch_pid (const unsigned long);
 
-	void evma_start_proxy(const char*, const char*);
-	void evma_stop_proxy(const char*);
+	void evma_start_proxy(const unsigned long, const unsigned long, const unsigned long);
+	void evma_stop_proxy(const unsigned long);
 
 	int evma_set_rlimit_nofile (int n_files);
 

data/ext/eventmachine_cpp.h

@@ -1,96 +1,96 @@
-/*****************************************************************************
-
-$Id$
-
-File:     eventmachine_cpp.h
-Date:     27Jul07
-
-Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
-Gmail: blackhedd
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of either: 1) the GNU General Public License
-as published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version; or 2) Ruby's License.
-
-See the file COPYING for complete licensing information.
-
-*****************************************************************************/
-
-
-#ifndef __EVMA_EventmachineCpp__H_
-#define __EVMA_EventmachineCpp__H_
-
-
-// This material is only for directly integrating EM into C++ programs.
-
-namespace EM {
-
-	void Callback (const char *sig, int event, const char *data, int length);
-	void Run (void(*)(void));
-	void AddTimer (int, void(*)());
-	void StopReactor();
-
-	/***************
-	class Eventable
-	***************/
-
-	class Eventable {
-		public:
-			Eventable() {}
-			virtual ~Eventable() {}
-
-			std::string Signature;
-
-			// Called by the framework
-			virtual void ReceiveData (const char *data, int length) {}
-			virtual void ConnectionCompleted() {}
-			virtual void Accept (const char*) {}
-			virtual void Unbind() {}
-			virtual void PostInit() {}
-			virtual void SslHandshakeCompleted() {}
-
-			void StopReactor() {EM::StopReactor();}
-	};
-
-	/****************
-	class Connection
-	****************/
-
-	class Connection: public Eventable {
-		public:
-			Connection() {}
-			virtual ~Connection() {}
-
-			virtual void Connect (const char*, int);
-			virtual void BindConnect (const char *, int, const char*, int);
-
-			void SendData (const char *data);
-			void SendData (const char *data, int length);
-			void Close (bool afterWriting);
-	};
-
-
-	/**************
-	class Acceptor
-	**************/
-
-	class Acceptor: public Eventable {
-		public:
-			Acceptor() {PostInit();}
-			virtual ~Acceptor() {}
-
-			void Start (const char*, int);
-			void Accept (const char*);
-
-			virtual Connection *MakeConnection() {return new Connection();}
-	};
-
-
-};
-
-
-
-
-
-#endif // __EVMA_EventmachineCpp__H_
+/*****************************************************************************
+
+$Id$
+
+File:     eventmachine_cpp.h
+Date:     27Jul07
+
+Copyright (C) 2006-07 by Francis Cianfrocca. All Rights Reserved.
+Gmail: blackhedd
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of either: 1) the GNU General Public License
+as published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version; or 2) Ruby's License.
+
+See the file COPYING for complete licensing information.
+
+*****************************************************************************/
+
+
+#ifndef __EVMA_EventmachineCpp__H_
+#define __EVMA_EventmachineCpp__H_
+
+
+// This material is only for directly integrating EM into C++ programs.
+
+namespace EM {
+
+	void Callback (const unsigned long sig, int event, const char *data, const unsigned long length);
+	void Run (void(*)(void));
+	void AddTimer (int, void(*)());
+	void StopReactor();
+
+	/***************
+	class Eventable
+	***************/
+
+	class Eventable {
+		public:
+			Eventable() {}
+			virtual ~Eventable() {}
+
+			unsigned long Signature;
+
+			// Called by the framework
+			virtual void ReceiveData (const char *data, int length) {}
+			virtual void ConnectionCompleted() {}
+			virtual void Accept (const unsigned long) {}
+			virtual void Unbind() {}
+			virtual void PostInit() {}
+			virtual void SslHandshakeCompleted() {}
+
+			void StopReactor() {EM::StopReactor();}
+	};
+
+	/****************
+	class Connection
+	****************/
+
+	class Connection: public Eventable {
+		public:
+			Connection() {}
+			virtual ~Connection() {}
+
+			virtual void Connect (const char*, int);
+			virtual void BindConnect (const char *, int, const char*, int);
+
+			void SendData (const char *data);
+			void SendData (const char *data, int length);
+			void Close (bool afterWriting);
+	};
+
+
+	/**************
+	class Acceptor
+	**************/
+
+	class Acceptor: public Eventable {
+		public:
+			Acceptor() {PostInit();}
+			virtual ~Acceptor() {}
+
+			void Start (const char*, int);
+			void Accept (const unsigned long);
+
+			virtual Connection *MakeConnection() {return new Connection();}
+	};
+
+
+};
+
+
+
+
+
+#endif // __EVMA_EventmachineCpp__H_

data/ext/extconf.rb

@@ -1,133 +1,148 @@
-require 'mkmf'
-
-def check_libs libs = [], fatal = false
-  libs.all? { |lib| have_library(lib) || (abort("could not find library: #{lib}") if fatal) }
-end
-
-def check_heads heads = [], fatal = false
-  heads.all? { |head| have_header(head) || (abort("could not find header: #{head}") if fatal)}
-end
-
-def add_define(name)
-  $defs.push("-D#{name}")
-end
-
-add_define 'BUILD_FOR_RUBY'
-add_define 'HAVE_RBTRAP' if have_var('rb_trap_immediate', ['ruby.h', 'rubysig.h'])
-add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro('RUBY_UBF_IO', 'ruby.h')
-add_define "HAVE_INOTIFY" if inotify = have_func('inotify_init', 'sys/inotify.h')
-add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sys/syscall.h')
-add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
-
-# Minor platform details between *nix and Windows:
-
-if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
-  GNU_CHAIN = $1 == 'mingw'
-  OS_WIN32 = true
-  add_define "OS_WIN32"
-else
-  GNU_CHAIN = true
-  OS_UNIX = true
-  add_define 'OS_UNIX'
-
-  add_define "HAVE_KQUEUE" if have_header("sys/event.h") and have_header("sys/queue.h")
-end
-
-# Main platform invariances:
-
-case RUBY_PLATFORM
-when /mswin32/, /mingw32/, /bccwin32/
-  check_heads(%w[windows.h winsock.h], true)
-  check_libs(%w[kernel32 rpcrt4 gdi32], true)
-
-  if GNU_CHAIN
-    CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
-  else
-    $defs.push "-EHs"
-    $defs.push "-GR"
-  end
-
-when /solaris/
-  check_libs(%w[nsl socket], true)
-
-  add_define 'OS_SOLARIS8'
-
-  # Patch by Tim Pease, fixes SUNWspro compile problems.
-  if CONFIG['CC'] == 'cc'
-    # SUN CHAIN
-    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
-    CONFIG['CCDLFLAGS'] = "-KPIC"
-  else
-    # GNU CHAIN
-    # on Unix we need a g++ link, not gcc.
-    CONFIG['LDSHARED'] = "$(CXX) -shared"
-  end
-
-when /openbsd/
-  # OpenBSD branch contributed by Guillaume Sellier.
-
-  # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
-  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
-
-when /darwin/
-
-  # on Unix we need a g++ link, not gcc.
-  # Ff line contributed by Daniel Harple.
-  CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
-
-when /linux/
-
-  # Original epoll test is inadequate because 2.4 kernels have the header
-  # but not the code.
-  # add_define 'HAVE_EPOLL' if have_header('sys/epoll.h')
-  if have_header('sys/epoll.h')
-    File.open("hasEpollTest.c", "w") {|f|
-      f.puts "#include <sys/epoll.h>"
-      f.puts "int main() { epoll_create(1024); return 0;}"
-    }
-    (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
-    `rm -f hasEpollTest.c hasEpollTest`
-    add_define 'HAVE_EPOLL' if e == 0
-  end
-
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-else
-  # on Unix we need a g++ link, not gcc.
-  CONFIG['LDSHARED'] = "$(CXX) -shared"
-end
-
-# OpenSSL:
-
-def manual_ssl_config
-  ssl_libs_heads_args = {
-    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :darwin => [%w[ssl crypto C], %w[openssl/ssl.h openssl/err.h]],
-    # openbsd and linux:
-    :crypto_hack => [%w[crypto ssl crypto], %w[openssl/ssl.h openssl/err.h]],
-    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
-  }
-
-  dc_flags = ['ssl']
-  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM
-
-  libs, heads = case RUBY_PLATFORM
-  when /mswin/    ; ssl_libs_heads_args[:mswin]
-  when /mingw/    ; ssl_libs_heads_args[:unix]
-  when /darwin/   ; ssl_libs_heads_args[:darwin]
-  when /openbsd/  ; ssl_libs_heads_args[:crypto_hack]
-  when /linux/    ; ssl_libs_heads_args[:crypto_hack]
-  else              ssl_libs_heads_args[:unix]
-  end
-  dir_config(*dc_flags)
-  check_libs(libs) and check_heads(heads)
-end
-
-# Try to use pkg_config first, fixes #73
-if pkg_config('openssl') || manual_ssl_config
-  add_define "WITH_SSL"
-else
-  add_define "WITHOUT_SSL"
-end
-
+require 'mkmf'
+
+def check_libs libs = [], fatal = false
+  libs.all? { |lib| have_library(lib) || (abort("could not find library: #{lib}") if fatal) }
+end
+
+def check_heads heads = [], fatal = false
+  heads.all? { |head| have_header(head) || (abort("could not find header: #{head}") if fatal)}
+end
+
+def add_define(name)
+  $defs.push("-D#{name}")
+end
+
+add_define 'BUILD_FOR_RUBY'
+add_define 'HAVE_RBTRAP' if have_var('rb_trap_immediate', ['ruby.h', 'rubysig.h'])
+add_define "HAVE_TBR" if have_func('rb_thread_blocking_region')# and have_macro('RUBY_UBF_IO', 'ruby.h')
+add_define "HAVE_INOTIFY" if inotify = have_func('inotify_init', 'sys/inotify.h')
+add_define "HAVE_OLD_INOTIFY" if !inotify && have_macro('__NR_inotify_init', 'sys/syscall.h')
+add_define 'HAVE_WRITEV' if have_func('writev', 'sys/uio.h')
+have_func('rb_thread_check_ints')
+have_func('rb_time_new')
+
+# Minor platform details between *nix and Windows:
+
+if RUBY_PLATFORM =~ /(mswin|mingw|bccwin)/
+  GNU_CHAIN = $1 == 'mingw'
+  OS_WIN32 = true
+  add_define "OS_WIN32"
+else
+  GNU_CHAIN = true
+  OS_UNIX = true
+  add_define 'OS_UNIX'
+
+  add_define "HAVE_KQUEUE" if have_header("sys/event.h") and have_header("sys/queue.h")
+end
+
+# Main platform invariances:
+
+case RUBY_PLATFORM
+when /mswin32/, /mingw32/, /bccwin32/
+  check_heads(%w[windows.h winsock.h], true)
+  check_libs(%w[kernel32 rpcrt4 gdi32], true)
+
+  if GNU_CHAIN
+    CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++"
+  else
+    $defs.push "-EHs"
+    $defs.push "-GR"
+  end
+
+when /solaris/
+  add_define 'OS_SOLARIS8'
+  check_libs(%w[nsl socket], true)
+
+  # Patch by Tim Pease, fixes SUNWspro compile problems.
+  if CONFIG['CC'] == 'cc'
+    # SUN CHAIN
+    $CFLAGS = CONFIG['CFLAGS'] = "-KPIC -G"
+    CONFIG['CCDLFLAGS'] = "-KPIC"
+  else
+    # GNU CHAIN
+    # on Unix we need a g++ link, not gcc.
+    CONFIG['LDSHARED'] = "$(CXX) -shared"
+  end
+
+when /openbsd/
+  # OpenBSD branch contributed by Guillaume Sellier.
+
+  # on Unix we need a g++ link, not gcc. On OpenBSD, linking against libstdc++ have to be explicitly done for shared libs
+  CONFIG['LDSHARED'] = "$(CXX) -shared -lstdc++ -fPIC"
+  CONFIG['LDSHAREDXX'] = "$(CXX) -shared -lstdc++ -fPIC"
+
+when /darwin/
+  # on Unix we need a g++ link, not gcc.
+  # Ff line contributed by Daniel Harple.
+  CONFIG['LDSHARED'] = "$(CXX) " + CONFIG['LDSHARED'].split[1..-1].join(' ')
+
+when /linux/
+  add_define 'HAVE_EPOLL' if have_func('epoll_create', 'sys/epoll.h')
+
+  # Original epoll test is inadequate because 2.4 kernels have the header
+  # but not the code.
+  # add_define 'HAVE_EPOLL' if have_header('sys/epoll.h')
+  # if have_header('sys/epoll.h')
+  #   File.open("hasEpollTest.c", "w") {|f|
+  #     f.puts "#include <sys/epoll.h>"
+  #     f.puts "int main() { epoll_create(1024); return 0;}"
+  #   }
+  #   (e = system( "gcc hasEpollTest.c -o hasEpollTest " )) and (e = $?.to_i)
+  #   `rm -f hasEpollTest.c hasEpollTest`
+  #   add_define 'HAVE_EPOLL' if e == 0
+  # end
+
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) -shared"
+
+when /aix/
+  CONFIG['LDSHARED'] = "$(CXX) -shared -Wl,-G -Wl,-brtl"
+
+else
+  # on Unix we need a g++ link, not gcc.
+  CONFIG['LDSHARED'] = "$(CXX) -shared"
+end
+
+# OpenSSL:
+
+def manual_ssl_config
+  ssl_libs_heads_args = {
+    :unix => [%w[ssl crypto], %w[openssl/ssl.h openssl/err.h]],
+    :darwin => [%w[ssl crypto C], %w[openssl/ssl.h openssl/err.h]],
+    # openbsd and linux:
+    :crypto_hack => [%w[crypto ssl crypto], %w[openssl/ssl.h openssl/err.h]],
+    :mswin => [%w[ssleay32 libeay32], %w[openssl/ssl.h openssl/err.h]],
+  }
+
+  dc_flags = ['ssl']
+  dc_flags += ["#{ENV['OPENSSL']}/include", ENV['OPENSSL']] if /linux/ =~ RUBY_PLATFORM
+
+  libs, heads = case RUBY_PLATFORM
+  when /mswin/    ; ssl_libs_heads_args[:mswin]
+  when /mingw/    ; ssl_libs_heads_args[:unix]
+  when /darwin/   ; ssl_libs_heads_args[:darwin]
+  when /openbsd/  ; ssl_libs_heads_args[:crypto_hack]
+  when /linux/    ; ssl_libs_heads_args[:crypto_hack]
+  else              ssl_libs_heads_args[:unix]
+  end
+  dir_config(*dc_flags)
+  check_libs(libs) and check_heads(heads)
+end
+
+# Try to use pkg_config first, fixes #73
+if pkg_config('openssl') || manual_ssl_config
+  add_define "WITH_SSL"
+else
+  add_define "WITHOUT_SSL"
+end
+
+# solaris c++ compiler doesn't have make_pair()
+TRY_LINK.sub!('$(CC)', '$(CXX)')
+add_define 'HAVE_MAKE_PAIR' if try_link(<<SRC, '-lstdc++')
+  #include <utility>
+  using namespace std;
+  int main(){ pair<int,int> tuple = make_pair(1,2); }
+SRC
+TRY_LINK.sub!('$(CXX)', '$(CC)')
+
 create_makefile "rubyeventmachine"