From b814cd9bee98e3ea8ea475d5918383d1c5ae7e86 Mon Sep 17 00:00:00 2001
From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sat, 31 Oct 2009 21:50:11 +0000
Subject: [PATCH] * Windows build fix (swap #include) * Windows SSL check and
 support in config.w32 * Typo in test name

---
 config.w32                 | 4 ++++
 php_stomp.c                | 2 --
 php_stomp.h                | 2 ++
 tests/003-connect/001.phpt | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/config.w32 b/config.w32
index 68d99de..091e00b 100644
--- a/config.w32
+++ b/config.w32
@@ -4,6 +4,10 @@
 ARG_ENABLE("stomp", "enable stomp support", "no");
 
 if (PHP_STOMP != "no") {
+	if (CHECK_LIB("ssleay32.lib", "stomp", PHP_STOMP) && CHECK_LIB("libeay32.lib", "stomp", PHP_STOMP)) {
+		ADD_FLAG("CFLAGS_STOMP", "/DHAVE_STOMP_SSL=1");
+	}
+
 	EXTENSION("stomp", "stomp.c php_stomp.c");
 }
 
diff --git a/php_stomp.c b/php_stomp.c
index 00ecea5..bf65c8d 100755
--- a/php_stomp.c
+++ b/php_stomp.c
@@ -27,8 +27,6 @@
 #include "zend_exceptions.h"
 #include "ext/standard/info.h"
 #include "ext/standard/url.h"
-#include "ext/standard/fsock.h"
-#include "stomp.h"
 #include "php_stomp.h"
 
 #include "ext/standard/php_smart_str.h"
diff --git a/php_stomp.h b/php_stomp.h
index 5d28d24..0c52816 100644
--- a/php_stomp.h
+++ b/php_stomp.h
@@ -21,6 +21,8 @@
 #ifndef PHP_STOMP_H
 #define PHP_STOMP_H
 
+#include "stomp.h"
+
 typedef struct _stomp_object {
     zend_object std;
     stomp_t *stomp;
diff --git a/tests/003-connect/001.phpt b/tests/003-connect/001.phpt
index 6058eeb..ddbfd2a 100644
--- a/tests/003-connect/001.phpt
+++ b/tests/003-connect/001.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Check stom_connect
+Check stomp_connect
 --SKIPIF--
 <?php if (!extension_loaded("stomp")) print "skip"; ?>
 --FILE--