cleanups, release fixes and ugly code replace

git-svn-id: https://svn.php.net/repository/pecl/pcsc/trunk@335787 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Johannes Findeisen 2015-01-22 22:21:24 +00:00
commit 55640fee83
3 changed files with 8 additions and 8 deletions

View file

@ -21,14 +21,14 @@ Windows are supported.
<time>23:02:23</time>
<version>
<release>0.3.1</release>
<api>0.3</api>
<api>0.3.1</api>
</version>
<stability>
<release>alpha</release>
<api>alpha</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<notes>Fix w32 build, fix compiler warnings, use zval resource instead of LONG for handles</notes>
<notes>Fixed bug to make the use of the T=0 protocol possible.</notes>
<contents>
<dir name="/">
<file name="COPYING" role="doc" />

2
pcsc.c
View file

@ -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;

View file

@ -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 <winscard.h>
#ifndef PHP_WIN32
#include <PCSC/pcsclite.h>
#endif
#include <winscard.h>
#ifndef PHP_WIN32
#include <PCSC/pcsclite.h>
#endif
PHP_MINIT_FUNCTION(pcsc);
PHP_MSHUTDOWN_FUNCTION(pcsc);