From 55640fee83fcae506ce15f3c15ffaa2d22e7722c Mon Sep 17 00:00:00 2001 From: Johannes Findeisen Date: Thu, 22 Jan 2015 22:21:24 +0000 Subject: [PATCH] cleanups, release fixes and ugly code replace git-svn-id: https://svn.php.net/repository/pecl/pcsc/trunk@335787 c90b9560-bf6c-de11-be94-00142212c4b1 --- package.xml | 4 ++-- pcsc.c | 2 +- php_pcsc.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.xml b/package.xml index 04b49a8..e977d85 100644 --- a/package.xml +++ b/package.xml @@ -21,14 +21,14 @@ Windows are supported. 0.3.1 - 0.3 + 0.3.1 alpha alpha PHP - Fix w32 build, fix compiler warnings, use zval resource instead of LONG for handles + Fixed bug to make the use of the T=0 protocol possible. diff --git a/pcsc.c b/pcsc.c index cad2008..7dc03c6 100644 --- a/pcsc.c +++ b/pcsc.c @@ -590,7 +590,7 @@ PHP_FUNCTION(scard_list_readers) Return a handle to the card */ PHP_FUNCTION(scard_connect) { - DWORD dwPreferredProtocol = SCARD_PROTOCOL_T1|SCARD_PROTOCOL_T0; + DWORD dwPreferredProtocol = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1; DWORD dwCurrentProtocol; SCARDHANDLE hCard = 0; LONG rc = 0; diff --git a/php_pcsc.h b/php_pcsc.h index 5cdfdd4..1cb0598 100644 --- a/php_pcsc.h +++ b/php_pcsc.h @@ -4,7 +4,7 @@ extern zend_module_entry pcsc_module_entry; #define phpext_pcsc_ptr &pcsc_module_entry -#define PHP_PCSC_VERSION "0.3" +#define PHP_PCSC_VERSION "0.3.1" #ifdef PHP_WIN32 #define PHP_PCSC_API __declspec(dllexport) @@ -16,10 +16,10 @@ extern zend_module_entry pcsc_module_entry; #include "TSRM.h" #endif -#include -#ifndef PHP_WIN32 -#include -#endif +#include +#ifndef PHP_WIN32 +#include +#endif PHP_MINIT_FUNCTION(pcsc); PHP_MSHUTDOWN_FUNCTION(pcsc);