[Pcsclite-git-commit] [PCSC] 02/11: make definition of SCARD_SCOPE_GLOBAL public

[Ludovic Rousseau]

This is an automated email from the git hooks/post-receive script.

rousseau pushed a commit to branch master
in repository PCSC.

commit a9dbb3c3ca1527228711f3e6c61fee15a1a80971
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Fri Mar 11 09:43:53 2016 +0100

    make definition of SCARD_SCOPE_GLOBAL public
    
    Move the definition of SCARD_SCOPE_GLOBAL from an internal header file
    to a public header file (pcsclite.h).
    SCARD_SCOPE_GLOBAL is now defined with the other SCARD_SCOPE_* values
    
    Thanks to Maksim Ivanov for the bug report
    http://lists.alioth.debian.org/pipermail/pcsclite-muscle/Week-of-Mon-20160307/000536.html
---
 src/PCSC/pcsclite.h.in | 1 +
 src/pcscd.h.in         | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/PCSC/pcsclite.h.in b/src/PCSC/pcsclite.h.in
index e3e5bde..5b3547e 100644
--- a/src/PCSC/pcsclite.h.in
+++ b/src/PCSC/pcsclite.h.in
@@ -234,6 +234,7 @@ extern const SCARD_IO_REQUEST g_rgSCardT0Pci, g_rgSCardT1Pci, g_rgSCardRawPci;
 #define SCARD_SCOPE_USER		0x0000	/**< Scope in user space */
 #define SCARD_SCOPE_TERMINAL		0x0001	/**< Scope in terminal */
 #define SCARD_SCOPE_SYSTEM		0x0002	/**< Scope in system */
+#define SCARD_SCOPE_GLOBAL		0x0003	/**< Scope is global */
 
 #define SCARD_PROTOCOL_UNDEFINED	0x0000	/**< protocol not set */
 #define SCARD_PROTOCOL_UNSET SCARD_PROTOCOL_UNDEFINED	/* backward compat */
diff --git a/src/pcscd.h.in b/src/pcscd.h.in
index 1a75c3c..3ebc0e6 100644
--- a/src/pcscd.h.in
+++ b/src/pcscd.h.in
@@ -38,8 +38,6 @@
 
 #define TIME_BEFORE_SUICIDE 60
 
-#define SCARD_SCOPE_GLOBAL		0x0003	/**< Scope is global */
-
 #define SCARD_RESET			0x0001	/**< Card was reset */
 #define SCARD_INSERTED			0x0002	/**< Card was inserted */
 #define SCARD_REMOVED			0x0004	/**< Card was removed */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pcsclite/PCSC.git