aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorphsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-27 07:41:54 +0000
committerphsultan <phsultan@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-27 07:41:54 +0000
commit21df00b4cf38973cbcb415b808b21dcfeec9eed7 (patch)
tree89453353ca58354d57591964972234d9b29667a4 /include
parent43f790e343b897557c89d2cfeb4f8be1da37eee7 (diff)
Merged revisions 125703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r125703 | phsultan | 2008-06-27 09:28:17 +0200 (Fri, 27 Jun 2008) | 1 line Fix a compile time error that occurs if OpenSSL is not installed. Reported by Noel Morais on the users mailing list ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@125704 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/jabber.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/jabber.h b/include/asterisk/jabber.h
index 5b427cac1..b56900d14 100644
--- a/include/asterisk/jabber.h
+++ b/include/asterisk/jabber.h
@@ -49,13 +49,13 @@
#include <openssl/err.h>
#define TRY_SECURE 2
#define SECURE 4
+
+#endif /* HAVE_OPENSSL */
/* file is read by blocks with this size */
#define NET_IO_BUF_SIZE 4096
/* Return value for timeout connection expiration */
#define IKS_NET_EXPIRED 12
-#endif /* HAVE_OPENSSL */
-
#include <iksemel.h>
#include "asterisk/astobj.h"
#include "asterisk/linkedlists.h"