[Pcsclite-git-commit] [PCSC] 02/02: Use correct prototype for pcsc_stringify_error()

Ludovic Rousseau rousseau at moszumanska.debian.org
Fri May 15 16:03:19 UTC 2015


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

rousseau pushed a commit to branch master
in repository PCSC.

commit e2752b7b26b0fc6cbee5f66be501396245cefee1
Author: Ludovic Rousseau <ludovic.rousseau at free.fr>
Date:   Fri May 15 17:59:08 2015 +0200

    Use correct prototype for pcsc_stringify_error()
    
    If NO_LOG is defined the code failed to build on Mac OS X:
    error.c:53:16: error: conflicting types for 'pcsc_stringify_error'
    PCSC_API char* pcsc_stringify_error(const long pcscError)
                   ^
    ../src/PCSC/pcsclite.h:237:7: note: previous declaration is here
    char *pcsc_stringify_error(const LONG);
          ^
    1 error generated.
    
    The prototype used in the case of NO_LOG was not the same as in the normal
    case: "long" instead of "LONG".
    
    Thanks to Frank Morgner for the bug report.
    https://github.com/LudovicRousseau/PCSC/pull/1
---
 src/error.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/error.c b/src/error.c
index c2a8082..422d5d6 100644
--- a/src/error.c
+++ b/src/error.c
@@ -50,7 +50,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "string.h"
 
 #ifdef NO_LOG
-PCSC_API char* pcsc_stringify_error(const long pcscError)
+PCSC_API char* pcsc_stringify_error(const LONG pcscError)
 {
 	static char strError[] = "0x12345678";
 

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



More information about the Pcsclite-cvs-commit mailing list