psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Merge branch 'master' of git://git.psyced.org/git/psyced

This commit is contained in:
Gabor Adam Toth 2011-05-23 01:56:49 +02:00
parent ffabd7af08 754fccd4ae
commit c4a915e82f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
world/drivers/ldmud/master/accept.c
View File

@ -113,7 +113,7 @@ object connect(int uid, int port, string service) {
#endif #endif
#if HAS_PORT(SPYCS_PORT, SPYC_PATH) #if HAS_PORT(SPYCS_PORT, SPYC_PATH)
case SPYCS_PORT: // inofficial & temporary case SPYCS_PORT: // interim name for PSYC 1.0 according to SPEC
# if __EFUN_DEFINED__(tls_want_peer_certificate) # if __EFUN_DEFINED__(tls_want_peer_certificate)
tls_want_peer_certificate(ME); tls_want_peer_certificate(ME);
# endif # endif
@ -125,6 +125,9 @@ object connect(int uid, int port, string service) {
case SPYC_PORT: case SPYC_PORT:
#endif #endif
#if HAS_PORT(SPYC_PORT, SPYC_PATH) || HAS_PORT(SPYCS_PORT, SPYC_PATH) #if HAS_PORT(SPYC_PORT, SPYC_PATH) || HAS_PORT(SPYCS_PORT, SPYC_PATH)
# if __EFUN_DEFINED__(enable_binary)
enable_binary(ME);
# endif
# ifdef DRIVER_HAS_CALL_BY_REFERENCE # ifdef DRIVER_HAS_CALL_BY_REFERENCE
arg = ME; arg = ME;
query_ip_number(&arg); query_ip_number(&arg);