From dbb767ca6526e04ac844504c7cf79023db1f7207 Mon Sep 17 00:00:00 2001 From: psychon Date: Fri, 20 Aug 2010 16:40:56 +0000 Subject: [PATCH] Fix some function prototypes CChan::OnOp() and CChan::OnVoice() were both undefinied. These two prototypes confused the compiler when calling CSocket::Listen(1234) since they both matched: CSocket::Listen(unsigned short, bool=false, unsigned int=0); Csock::Listen(unsigned short, int=SOMAXCONN, const CString&="", u_int=0); Thanks to DarthGandalf for noticing these. git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2108 726aef4b-f618-498e-8847-2d620e286838 --- Chan.h | 2 -- Socket.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Chan.h b/Chan.h index 14a17a3b..1ecb765c 100644 --- a/Chan.h +++ b/Chan.h @@ -68,8 +68,6 @@ public: void ModeChange(const CString& sModes, const CString& sNick = ""); bool AddMode(unsigned char uMode, const CString& sArg); bool RemMode(unsigned char uMode); - void OnOp(const CString& sOpNick, const CString& sNick, bool bOpped); - void OnVoice(const CString& sOpNick, const CString& sNick, bool bVoiced); CString GetModeString() const; CString GetModeArg(CString& sArgs) const; CString GetModeForNames() const; diff --git a/Socket.h b/Socket.h index e5528096..d3995743 100644 --- a/Socket.h +++ b/Socket.h @@ -126,7 +126,7 @@ public: virtual bool ConnectionFrom(const CString& sHost, unsigned short uPort); bool Connect(const CString& sHostname, unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 60); - bool Listen(unsigned short uPort, bool bSSL = false, unsigned int uTimeout = 0); + bool Listen(unsigned short uPort, bool bSSL, unsigned int uTimeout = 0); // Getters CModule* GetModule() const;