* Windows build fix (swap #include)
* Windows SSL check and support in config.w32 * Typo in test namev1.1
parent
af9d576c36
commit
b814cd9bee
|
@ -4,6 +4,10 @@
|
||||||
ARG_ENABLE("stomp", "enable stomp support", "no");
|
ARG_ENABLE("stomp", "enable stomp support", "no");
|
||||||
|
|
||||||
if (PHP_STOMP != "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");
|
EXTENSION("stomp", "stomp.c php_stomp.c");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,6 @@
|
||||||
#include "zend_exceptions.h"
|
#include "zend_exceptions.h"
|
||||||
#include "ext/standard/info.h"
|
#include "ext/standard/info.h"
|
||||||
#include "ext/standard/url.h"
|
#include "ext/standard/url.h"
|
||||||
#include "ext/standard/fsock.h"
|
|
||||||
#include "stomp.h"
|
|
||||||
#include "php_stomp.h"
|
#include "php_stomp.h"
|
||||||
|
|
||||||
#include "ext/standard/php_smart_str.h"
|
#include "ext/standard/php_smart_str.h"
|
||||||
|
|
|
@ -21,6 +21,8 @@
|
||||||
#ifndef PHP_STOMP_H
|
#ifndef PHP_STOMP_H
|
||||||
#define PHP_STOMP_H
|
#define PHP_STOMP_H
|
||||||
|
|
||||||
|
#include "stomp.h"
|
||||||
|
|
||||||
typedef struct _stomp_object {
|
typedef struct _stomp_object {
|
||||||
zend_object std;
|
zend_object std;
|
||||||
stomp_t *stomp;
|
stomp_t *stomp;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--TEST--
|
--TEST--
|
||||||
Check stom_connect
|
Check stomp_connect
|
||||||
--SKIPIF--
|
--SKIPIF--
|
||||||
<?php if (!extension_loaded("stomp")) print "skip"; ?>
|
<?php if (!extension_loaded("stomp")) print "skip"; ?>
|
||||||
--FILE--
|
--FILE--
|
||||||
|
|
Loading…
Reference in New Issue