[Pcsclite-cvs-commit] r3334 - in /trunk/PCSC/src: PCSC/pcsclite.h.in PCSC/wintypes.h debug.c debuglog.c thread_generic.h
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Mon Mar 2 14:56:38 UTC 2009
Author: rousseau
Date: Mon Mar 2 14:56:38 2009
New Revision: 3334
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3334
Log:
remove support of WIN32
Modified:
trunk/PCSC/src/PCSC/pcsclite.h.in
trunk/PCSC/src/PCSC/wintypes.h
trunk/PCSC/src/debug.c
trunk/PCSC/src/debuglog.c
trunk/PCSC/src/thread_generic.h
Modified: trunk/PCSC/src/PCSC/pcsclite.h.in
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/pcsclite.h.in?rev=3334&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/pcsclite.h.in (original)
+++ trunk/PCSC/src/PCSC/pcsclite.h.in Mon Mar 2 14:56:38 2009
@@ -25,9 +25,6 @@
{
#endif
-#ifdef WIN32
-#include <winscard.h>
-#else
typedef long SCARDCONTEXT; /**< \p hContext returned by SCardEstablishContext() */
typedef SCARDCONTEXT *PSCARDCONTEXT;
typedef SCARDCONTEXT *LPSCARDCONTEXT;
@@ -176,8 +173,6 @@
#define SCARD_STATE_MUTE 0x0200 /**< Unresponsive card */
#define SCARD_STATE_UNPOWERED 0x0400 /**< Unpowered card */
-#endif
-
/** PC/SC Lite specific extensions */
#define SCARD_W_INSERTED_CARD 0x8010006A
#define SCARD_E_UNSUPPORTED_FEATURE 0x8010001F /**< feature not supported. */
Modified: trunk/PCSC/src/PCSC/wintypes.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/wintypes.h?rev=3334&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/wintypes.h (original)
+++ trunk/PCSC/src/PCSC/wintypes.h Mon Mar 2 14:56:38 2009
@@ -19,8 +19,6 @@
extern "C"
{
#endif
-
-#if !defined(WIN32)
#ifndef BYTE
typedef unsigned char BYTE;
@@ -54,10 +52,6 @@
typedef unsigned short WORD;
typedef unsigned long *PULONG;
-#else
-#include <windows.h>
-#endif
-
#ifdef __cplusplus
}
#endif
Modified: trunk/PCSC/src/debug.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/debug.c?rev=3334&op=diff
==============================================================================
--- trunk/PCSC/src/debug.c (original)
+++ trunk/PCSC/src/debug.c Mon Mar 2 14:56:38 2009
@@ -42,8 +42,6 @@
if (e)
LogLevel = atoi(e);
- /* no color under Windows */
-#ifndef WIN32
/* log to stderr and stderr is a tty? */
if (isatty(fileno(stderr)))
{
@@ -67,7 +65,6 @@
}
}
}
-#endif
} /* log_init */
void log_msg(const int priority, const char *fmt, ...)
@@ -86,18 +83,9 @@
return;
va_start(argptr, fmt);
-#ifndef WIN32
(void)vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
-#else
-#if HAVE_VSNPRINTF
- vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
-#else
- vsprintf(DebugBuffer, fmt, argptr);
-#endif
-#endif
va_end(argptr);
-#ifndef WIN32
{
if (LogDoColor)
{
@@ -127,9 +115,6 @@
else
fprintf(stderr, "%s\n", DebugBuffer);
}
-#else
- fprintf(stderr, "%s\n", DebugBuffer);
-#endif
} /* log_msg */
void log_xxd(const int priority, const char *msg, const unsigned char *buffer,
Modified: trunk/PCSC/src/debuglog.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/debuglog.c?rev=3334&op=diff
==============================================================================
--- trunk/PCSC/src/debuglog.c (original)
+++ trunk/PCSC/src/debuglog.c Mon Mar 2 14:56:38 2009
@@ -62,15 +62,7 @@
return;
va_start(argptr, fmt);
-#ifndef WIN32
vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
-#else
-#if HAVE_VSNPRINTF
- vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
-#else
- vsprintf(DebugBuffer, fmt, argptr);
-#endif
-#endif
va_end(argptr);
log_line(priority, DebugBuffer);
@@ -78,7 +70,6 @@
static void log_line(const int priority, const char *DebugBuffer)
{
-#ifndef WIN32
if (DEBUGLOG_SYSLOG_DEBUG == LogMsgType)
syslog(LOG_INFO, "%s", DebugBuffer);
else
@@ -135,9 +126,6 @@
else
fprintf(stderr, "%s\n", DebugBuffer);
}
-#else
- fprintf(stderr, "%s\n", DebugBuffer);
-#endif
} /* log_msg */
void log_xxd(const int priority, const char *msg, const unsigned char *buffer,
@@ -193,8 +181,6 @@
LogMsgType = DEBUGLOG_STDERR_DEBUG;
}
- /* no color under Windows */
-#ifndef WIN32
/* log to stderr and stderr is a tty? */
if (DEBUGLOG_STDERR_DEBUG == LogMsgType && isatty(fileno(stderr)))
{
@@ -218,7 +204,6 @@
}
}
}
-#endif
}
void DebugLogSetLevel(const int level)
@@ -298,22 +283,12 @@
return;
va_start(argptr, fmt);
-#ifndef WIN32
vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
-#else
-#if HAVE_VSNPRINTF
- vsnprintf(DebugBuffer, DEBUG_BUF_SIZE, fmt, argptr);
-#else
- vsprintf(DebugBuffer, fmt, argptr);
-#endif
-#endif
va_end(argptr);
-#ifndef WIN32
if (DEBUGLOG_SYSLOG_DEBUG == LogMsgType)
syslog(LOG_INFO, "%s", DebugBuffer);
else
-#endif
fprintf(stderr, "%s\n", DebugBuffer);
} /* debug_msg */
Modified: trunk/PCSC/src/thread_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/thread_generic.h?rev=3334&op=diff
==============================================================================
--- trunk/PCSC/src/thread_generic.h (original)
+++ trunk/PCSC/src/thread_generic.h Mon Mar 2 14:56:38 2009
@@ -17,30 +17,18 @@
#ifndef __thread_generic_h__
#define __thread_generic_h__
-#ifdef WIN32
-#include <windows.h>
-#include "PCSC.h"
-#else
#include <pthread.h>
#include <wintypes.h>
-#endif
#ifdef __cplusplus
extern "C"
{
#endif
-#ifdef WIN32
-#define PCSCLITE_THREAD_T HANDLE
-#define PCSCLITE_MUTEX CRITICAL_SECTION
-#define PCSCLITE_MUTEX_T CRITICAL_SECTION*
-#define PCSCLITE_THREAD_FUNCTION(f) void *(*f)(void *)
-#else
#define PCSCLITE_THREAD_T pthread_t
#define PCSCLITE_MUTEX pthread_mutex_t
#define PCSCLITE_MUTEX_T pthread_mutex_t*
#define PCSCLITE_THREAD_FUNCTION(f) void *(*f)(void *)
-#endif
/* thread attributes */
#define THREAD_ATTR_DEFAULT 0
More information about the Pcsclite-cvs-commit
mailing list