Changeset 3405 for trunk/src/libopensc

Show
Ignore:
Timestamp:
03/06/08 16:06:59 (10 months ago)
Author:
alonbl
Message:

Complete rewrite of OpenSC build system.

1. Build system now supports MinGW (Windows) compilation using msys and cross compilation.
2. Ability to explicitly disable and enable dependencies of the package.
3. openct, pcsc and nsplugins features are disabled by default.
4. Modified pcsc driver to use pcsc dynamically, no compile time dependency is required.
5. --enable-pcsc-lite configuration option renamed to --enable-pcsc.
6. Install opensc.conf file (as opensc.conf.new if opensc.conf exists).
7. Add--enable-doc configuration option, allow installing documentation into target.
8. Add --disable-man configuration option, allow msys mingw32 users to

build from svn without extra dependencies.

9. Add export files to each library in order to export only required symbols.

Windows native build may use these files instead of scanning objects' symbols.

10. Add opensc-tool --info to display some general information about the build.
11. Create compatibility library to be linked against library instread of recompiling the

same source files in different places.

12. Add different win32 version resource to each class of outputs.
13. Make xsl-stylesheets location selectable.
14. Some win32 fixups.
15. Some warning fixups.
16. Many other autoconf/automake cleanups.

Alon Bar-Lev

svn diff -r 3315:3399 https://www.opensc-project.org/svn/opensc/branches/alonbl/mingw

_M .
D configure.in
_M src
_M src/openssh
M src/openssh/Makefile.am
_M src/tools
M src/tools/rutoken-tool.c
M src/tools/opensc-tool.c
M src/tools/cardos-info.c
M src/tools/pkcs15-crypt.c
M src/tools/pkcs15-init.c
M src/tools/piv-tool.c
M src/tools/netkey-tool.c
M src/tools/eidenv.c
M src/tools/cryptoflex-tool.c
M src/tools/util.c
M src/tools/pkcs11-tool.c
M src/tools/pkcs15-tool.c
M src/tools/util.h
M src/tools/opensc-explorer.c
M src/tools/Makefile.am
_M src/pkcs11
M src/pkcs11/pkcs11-global.c
M src/pkcs11/framework-pkcs15.c
M src/pkcs11/mechanism.c
M src/pkcs11/pkcs11-display.c
M src/pkcs11/pkcs11-object.c
A src/pkcs11/opensc-pkcs11.exports
M src/pkcs11/sc-pkcs11.h
M src/pkcs11/pkcs11-spy.c
M src/pkcs11/openssl.c
M src/pkcs11/Makefile.am
A src/pkcs11/pkcs11-spy.exports
_M src/tests
_M src/tests/regression
M src/tests/regression/Makefile.am
M src/tests/sc-test.c
M src/tests/pintest.c
M src/tests/Makefile.am
_M src/include
_M src/include/opensc
M src/include/opensc/Makefile.am
A src/include/opensc/svnignore
M src/include/Makefile.am
_M src/signer
_M src/signer/npinclude
M src/signer/npinclude/Makefile.am
M src/signer/Makefile.am
A src/signer/signer.exports
_M src/common
A src/common/compat_dummy.c
D src/common/getopt.txt
D src/common/strlcpy.c
D src/common/LICENSE
A src/common/compat_getopt.txt
A src/common/compat_strlcpy.c
A src/common/LICENSE.compat_getopt
A src/common/compat_getopt.c
D src/common/strlcpy.h
D src/common/ChangeLog
D src/common/getpass.c
D src/common/my_getopt.c
A src/common/compat_strlcpy.h
A src/common/compat_getpass.c
A src/common/compat_getopt.h
A src/common/ChangeLog.compat_getopt
D src/common/README.strlcpy
D src/common/my_getopt.h
A src/common/compat_getpass.h
A src/common/README.compat_strlcpy
D src/common/strlcpy.3
A src/common/README.compat_getopt
D src/common/getopt.3
D src/common/README.my_getopt
A src/common/compat_strlcpy.3
A src/common/compat_getopt.3
M src/common/Makefile.am
M src/Makefile.am
_M src/pkcs15init
M src/pkcs15init/pkcs15-oberthur.c
M src/pkcs15init/profile.c
M src/pkcs15init/pkcs15-lib.c
M src/pkcs15init/pkcs15-rutoken.c
A src/pkcs15init/pkcs15init.exports
M src/pkcs15init/pkcs15-gpk.c
M src/pkcs15init/Makefile.am
_M src/scconf
M src/scconf/Makefile.am
M src/scconf/parse.c
A src/scconf/scconf.exports
_M src/libopensc
M src/libopensc/card-rutoken.c
M src/libopensc/compression.c
M src/libopensc/sc.c
M src/libopensc/card-piv.c
M src/libopensc/pkcs15-openpgp.c
M src/libopensc/pkcs15-postecert.c
M src/libopensc/pkcs15-tcos.c
M src/libopensc/opensc-config.in
M src/libopensc/reader-pcsc.c
A src/libopensc/internal-winscard.h
M src/libopensc/ctx.c
A src/libopensc/libopensc.exports
M src/libopensc/pkcs15-piv.c
M src/libopensc/pkcs15-infocamere.c
M src/libopensc/internal.h
M src/libopensc/pkcs15-actalis.c
M src/libopensc/pkcs15-starcert.c
M src/libopensc/card-oberthur.c
M src/libopensc/pkcs15-atrust-acos.c
M src/libopensc/p15card-helper.c
D src/libopensc/part10.h
M src/libopensc/ui.c
M src/libopensc/card-gpk.c
M src/libopensc/pkcs15-wrap.c
M src/libopensc/pkcs15-gemsafeGPK.c
M src/libopensc/log.c
M src/libopensc/pkcs15-esteid.c
M src/libopensc/pkcs15-prkey-rutoken.c
M src/libopensc/log.h
M src/libopensc/Makefile.am
M src/libopensc/reader-openct.c
_M aclocal
M aclocal/Makefile.am
_M win32
M win32/Makefile.am
A win32/versioninfo.rc.in
A win32/ltrc.inc
A configure.ac
_M doc
_M doc/tools
M doc/tools/pkcs15-profile.xml
D doc/changelog.sh
D doc/export-wiki.xsl
_M doc/api
_M doc/api/file
M doc/api/man.xsl
_M doc/api/asn1
_M doc/api/apps
_M doc/api/init
_M doc/api/types
_M doc/api/card
M doc/api/html.xsl
_M doc/api/misc
_M doc/api/util
M doc/Makefile.am
D doc/export-wiki.sh
AM doc/nonpersistent
A doc/nonpersistent/export-wiki.xsl
A doc/nonpersistent/Makefile.am
A doc/nonpersistent/export-wiki.sh
A doc/nonpersistent/svn2cl.xsl
D doc/generate-man.sh
D doc/svn2cl.xsl
M Makefile.am
A svnignore
_M etc
M etc/opensc.conf.in
M etc/Makefile.am
D man
_M solaris
M solaris/Makefile

Location:
trunk
Files:
1 removed
31 modified
2 copied

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
        26 archive 
        27 acinclude.m4 
        28 aclocal.m4 
        29 autom4te.cache 
        30 compile 
        31 confdefs.h 
        32 config.cache 
        33 config.guess 
        34 config.h 
        35 config.h.in 
        36 config.log 
        37 config.status 
        38 config.sub 
        39 configure 
        40 conftest 
        41 conftest.c 
        42 depcomp 
        43 install-sh 
        44 libtool 
        45 libtool.m4 
        46 ltmain.sh 
        47 missing 
        48 mkinstalldirs 
        49 so_locations 
        50 stamp-h* 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54 
         55ChangeLog 
         56opensc.conf 
         57xsl-stylesheets 
         58opensc-config 
         59test-conf 
         60pkcs15-tool 
         61pkcs15-crypt 
         62pkcs15-init 
         63piv-tool 
         64eidenv 
         65opensc-explorer 
         66opensc-tool 
         67rutoken-tool 
         68cardos-info 
         69cryptoflex-tool 
         70netkey-tool 
         71pkcs11-tool 
         72pintest 
         73p15dump 
         74prngtest 
         75base64 
         76lottery 
         77 

  • trunk/src

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54 
         55ChangeLog 
         56opensc.conf 
         57xsl-stylesheets 
         58opensc-config 
         59test-conf 
         60pkcs15-tool 
         61pkcs15-crypt 
         62pkcs15-init 
         63piv-tool 
         64eidenv 
         65opensc-explorer 
         66opensc-tool 
         67rutoken-tool 
         68cardos-info 
         69cryptoflex-tool 
         70netkey-tool 
         71pkcs11-tool 
         72pintest 
         73p15dump 
         74prngtest 
         75base64 
         76lottery 
         77 

  • trunk/src/libopensc

    • Property svn:ignore

      •  

        old new  
         1Makefile 
         2Makefile.in 
         3core 
         4archive 
         5acinclude.m4 
         6aclocal.m4 
         7autom4te.cache 
         8compile 
         9confdefs.h 
         10config.* 
         11configure 
         12conftest 
         13conftest.c 
         14depcomp 
         15install-sh 
         16libtool 
         17libtool.m4 
         18ltmain.sh 
         19missing 
         20mkinstalldirs 
         21so_locations 
         22stamp-h* 
         23 
        124.deps 
        225.libs 
        … …  
        1942*.rej 
        2043*.u 
         44*.rc 
         45*.pc 
        2146*~ 
        22 Makefile 
        23 Makefile.in 
        24 core 
        25 gmon.out 
        26 *.pc 
         47*.gz 
         48*.bz2 
         49*.[0-9] 
         50*.html 
         51*.gif 
         52*.css 
         53*.out 
         54 
         55ChangeLog 
         56opensc.conf 
         57xsl-stylesheets 
        2758opensc-config 
         59test-conf 
         60pkcs15-tool 
         61pkcs15-crypt 
         62pkcs15-init 
         63piv-tool 
         64eidenv 
         65opensc-explorer 
         66opensc-tool 
         67rutoken-tool 
         68cardos-info 
         69cryptoflex-tool 
         70netkey-tool 
         71pkcs11-tool 
         72pintest 
         73p15dump 
         74prngtest 
         75base64 
         76lottery 
         77 

  • trunk/src/libopensc/Makefile.am

    r3310 r3405  
    11# Process this file with automake to create Makefile.in 
    22 
    3 includedir = @includedir@/opensc 
     3include $(top_srcdir)/win32/ltrc.inc 
    44 
    55MAINTAINERCLEANFILES = Makefile.in 
    6  
    7 EXTRA_DIST = Makefile.mak libopensc.pc.in libpkcs15init.pc.in libscconf.pc.in  
    8  
    9 INCLUDES = $(CPPFLAGS) $(OPENSSL_CFLAGS) $(OPENCT_CFLAGS) $(PCSC_CFLAGS) \ 
    10         $(LTLIB_CFLAGS) -I$(top_srcdir)/src/common 
    11 AM_LDFLAGS =  
     6CLEANFILES = versioninfo.rc 
     7EXTRA_DIST = Makefile.mak  
    128 
    139bin_SCRIPTS = opensc-config 
     10lib_LTLIBRARIES = libopensc.la 
     11openscinclude_HEADERS = \ 
     12        opensc.h pkcs15.h emv.h \ 
     13        cardctl.h asn1.h log.h ui.h \ 
     14        errors.h types.h compression.h 
     15noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h \ 
     16        internal-winscard.h p15card-helper.h 
     17pkgconfig_DATA = libopensc.pc libpkcs15init.pc libscconf.pc 
    1418 
    15 lib_LTLIBRARIES = libopensc.la 
     19AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \ 
     20        $(OPTIONAL_ZLIB_CFLAGS) $(LTLIB_CFLAGS)  
     21INCLUDES = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/common 
     22 
    1623libopensc_la_SOURCES = \ 
    1724        sc.c ctx.c ui.c log.c errors.c \ 
    … …  
    3845        pkcs15-actalis.c pkcs15-atrust-acos.c pkcs15-tccardos.c pkcs15-piv.c \ 
    3946        pkcs15-rutoken.c pkcs15-prkey-rutoken.c \ 
    40         compression.c p15card-helper.c 
    41 libopensc_la_LDFLAGS = -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ 
    42 libopensc_la_LIBADD = @LIBSCCONF@ $(OPENSSL_LIBS) $(OPENCT_LIBS) $(PCSC_LIBS) $(LTLIB_LIBS) 
     47        compression.c p15card-helper.c \ 
     48        \ 
     49        libopensc.exports 
     50if WIN32 
     51nodist_libopensc_la_SOURCES = versioninfo.rc 
     52endif 
     53libopensc_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(OPTIONAL_OPENCT_LIBS) \ 
     54        $(OPTIONAL_ZLIB_LIBS) $(LTLIB_LIBS) \ 
     55        $(top_builddir)/src/scconf/libscconf.la \ 
     56        $(top_builddir)/src/common/libcompat.la 
     57if WIN32 
     58libopensc_la_LIBADD += -lws2_32 
     59endif 
     60libopensc_la_LDFLAGS = $(AM_LDFLAGS) \ 
     61        -version-info @OPENSC_LT_CURRENT@:@OPENSC_LT_REVISION@:@OPENSC_LT_AGE@ \ 
     62        -export-symbols libopensc.exports \ 
     63        -no-undefined 
    4364 
    44 include_HEADERS = \ 
    45         opensc.h pkcs15.h emv.h \ 
    46         cardctl.h asn1.h log.h ui.h \ 
    47         errors.h types.h compression.h 
     65versioninfo.rc: 
     66        sed 's/@@FILE_DESCRIPTION@@/OpenSC Core Library/g' \ 
     67                "$(top_srcdir)/win32/versioninfo.rc" > versioninfo.rc 
    4868 
    49 noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.h part10.h p15card-helper.h 
    50  
    51 pkgconfigdir = $(libdir)/pkgconfig 
    52 pkgconfig_DATA = libopensc.pc libpkcs15init.pc libscconf.pc 
     69if WIN32 
     70# def file required for MS users to build library 
     71mylibdir=$(libdir) 
     72if CYGWIN 
     73mylib_DATA=.libs/cygopensc-@OPENSC_LT_CURRENT@.dll.def 
     74.libs/cygopensc-@OPENSC_LT_CURRENT@.dll.def:    libopensc.la 
     75else 
     76mylib_DATA=.libs/libopensc-@OPENSC_LT_CURRENT@.dll.def 
     77.libs/libopensc-@OPENSC_LT_CURRENT@.dll.def:    libopensc.la 
     78endif 
     79endif 

  • trunk/src/libopensc/card-gpk.c

    r3177 r3405  
    2222#include "cardctl.h" 
    2323#include "pkcs15.h" 
    24 #ifdef HAVE_OPENSSL 
     24#ifdef ENABLE_OPENSSL 
    2525#include <stdlib.h> 
    2626#include <string.h> 
    … …  
    19031903        return sc_get_driver(); 
    19041904} 
    1905 #endif /* HAVE_OPENSSL */ 
     1905#endif /* ENABLE_OPENSSL */ 

  • trunk/src/libopensc/card-oberthur.c

    r3206 r3405  
    2727#include "pkcs15.h" 
    2828 
    29 #ifdef HAVE_OPENSSL 
     29#ifdef ENABLE_OPENSSL 
    3030#include <stdlib.h> 
    3131#include <string.h> 
    … …  
    25052505} 
    25062506 
    2507 #endif /* HAVE_OPENSSL */ 
     2507#endif /* ENABLE_OPENSSL */ 

  • trunk/src/libopensc/card-piv.c

    r3292 r3405  
    2424 
    2525#include "internal.h" 
     26 
     27#ifdef ENABLE_OPENSSL 
     28 
    2629#include <ctype.h> 
    2730#include <string.h> 
    … …  
    3336#include "asn1.h" 
    3437#include "cardctl.h" 
    35 #ifdef HAVE_ZLIB_H 
     38#ifdef ENABLE_ZLIB 
    3639#include "compression.h" 
    3740#endif 
    … …  
    743746        /* Potential truncation */ 
    744747        if(compressed) { 
    745 #ifdef HAVE_ZLIB_H 
     748#ifdef ENABLE_ZLIB 
    746749                size_t len = count; 
    747750                u8* newBuf = NULL; 
    … …  
    18031806} 
    18041807#endif 
     1808 
     1809#endif 

  • trunk/src/libopensc/card-rutoken.c

    r3310 r3405  
    2626#include <stdlib.h> 
    2727#include "pkcs15.h" 
     28#if defined(HAVE_INTTYPES_H) 
     29#include <inttypes.h> 
     30#elif defined(HAVE_STDINT_H) 
     31#include <stdint.h> 
     32#elif defined(_MSC_VER) 
     33typedef unsigned __int32 uint32_t; 
     34typedef unsigned __int16 uint16_t; 
     35#else 
     36#warning no uint32_t type available, please contact opensc-devel@opensc-project.org 
     37#endif 
    2838 
    2939#define BIG_ENDIAN_RUTOKEN 
    3040 
    31 #ifdef HAVE_OPENSSL 
     41#ifdef ENABLE_OPENSSL 
    3242#include <openssl/evp.h> 
    3343#include <openssl/rsa.h> 
    … …  
    4353#define ID_RESERVED_CURDF   0x3FFF      /*Reserved ID for current DF*/ 
    4454 
    45 #ifdef HAVE_OPENSSL 
     55#ifdef ENABLE_OPENSSL 
    4656int get_prkey_from_bin(const u8 *data, size_t len, struct sc_pkcs15_prkey **key); 
    4757#endif 
    … …  
    343353{ 
    344354#ifdef BIG_ENDIAN_RUTOKEN 
    345         file->size = pIn[3] + ((u_int16_t)pIn[2])*256; 
    346         file->id = pIn[7] + ((u_int16_t)pIn[6])*256; 
     355        file->size = pIn[3] + ((uint16_t)pIn[2])*256; 
     356        file->id = pIn[7] + ((uint16_t)pIn[6])*256; 
    347357#else 
    348         file->size = pIn[2] + ((u_int16_t)pIn[3])*256; 
    349         file->id = pIn[6] + ((u_int16_t)pIn[7])*256; 
     358        file->size = pIn[2] + ((uint16_t)pIn[3])*256; 
     359        file->id = pIn[6] + ((uint16_t)pIn[7])*256; 
    350360#endif 
    351361 
    … …  
    10701080/*  RSA emulation  */ 
    10711081 
    1072 #ifdef HAVE_OPENSSL 
     1082#ifdef ENABLE_OPENSSL 
    10731083 
    10741084static int rutoken_get_current_fileid(sc_card_t *card, u8 id[2]) 
    … …  
    14161426        rutoken_ops.get_challenge = rutoken_get_challenge; 
    14171427         
    1418 #ifdef HAVE_OPENSSL 
     1428#ifdef ENABLE_OPENSSL 
    14191429        rutoken_ops.decipher = rutoken_decipher; 
    14201430        rutoken_ops.compute_signature = rutoken_compute_signature; 

  • trunk/src/libopensc/compression.c

    r3178 r3405  
    1919 */ 
    2020#include "internal.h" 
    21 #ifdef HAVE_ZLIB_H 
     21#ifdef ENABLE_ZLIB 
    2222#include "compression.h" 
    2323 
    … …  
    180180        } 
    181181} 
    182 #endif /* HAVE_ZLIB_H */ 
     182#endif /* ENABLE_ZLIB */ 

  • trunk/src/libopensc/ctx.c

    r3304 r3405  
    5757        { "flex",       (void *(*)(void)) sc_get_cryptoflex_driver }, 
    5858        { "cyberflex",  (void *(*)(void)) sc_get_cyberflex_driver }, 
    59 #ifdef HAVE_OPENSSL 
     59#ifdef ENABLE_OPENSSL 
    6060        { "gpk",        (void *(*)(void)) sc_get_gpk_driver }, 
    6161#endif 
    … …  
    6969        { "opengpg",    (void *(*)(void)) sc_get_openpgp_driver }, 
    7070        { "jcop",       (void *(*)(void)) sc_get_jcop_driver }, 
    71 #ifdef HAVE_OPENSSL 
     71#ifdef ENABLE_OPENSSL 
    7272        { "oberthur",   (void *(*)(void)) sc_get_oberthur_driver }, 
    7373#endif 
    … …  
    7777        { "emv",        (void *(*)(void)) sc_get_emv_driver }, 
    7878        { "incrypto34", (void *(*)(void)) sc_get_incrypto34_driver }, 
    79 #ifdef HAVE_OPENSSL 
     79#ifdef ENABLE_OPENSSL 
    8080        { "PIV-II",     (void *(*)(void)) sc_get_piv_driver }, 
    8181#endif 
    … …  
    8989 
    9090static const struct _sc_driver_entry internal_reader_drivers[] = { 
    91 #if defined(HAVE_PCSC) 
     91#if defined(ENABLE_PCSC) 
    9292        { "pcsc",       (void *(*)(void)) sc_get_pcsc_driver }, 
    9393#endif 
    9494        { "ctapi",      (void *(*)(void)) sc_get_ctapi_driver }, 
    9595#ifndef _WIN32 
    96 #ifdef HAVE_OPENCT 
     96#ifdef ENABLE_OPENCT 
    9797        { "openct",     (void *(*)(void)) sc_get_openct_driver }, 
    9898#endif 
    … …  
    557557#ifdef _WIN32 
    558558        char temp_path[PATH_MAX]; 
    559         int temp_len; 
     559        DWORD temp_len; 
    560560        long rc; 
    561561        HKEY hKey; 
    … …  
    848848 
    849849        while (1) { 
     850#ifdef _WIN32 
     851                if (mkdir(dirname) >= 0) 
     852#else 
    850853                if (mkdir(dirname, 0700) >= 0) 
     854#endif 
    851855                        break; 
    852856                if (errno != ENOENT 
    … …  
    864868                        break; 
    865869                dirname[j] = '/'; 
     870#ifdef _WIN32 
     871                if (mkdir(dirname) < 0) 
     872#else 
    866873                if (mkdir(dirname, 0700) < 0) 
     874#endif 
    867875                        goto failed; 
    868876        } 

  • trunk/src/libopensc/internal-winscard.h

    r3330 r3405  
    5656#define SCARD_E_NO_READERS_AVAILABLE    0x8010002E /**< Cannot find a smart card reader. */ 
    5757#define SCARD_W_UNRESPONSIVE_CARD       0x80100066 /**< The smart card is not responding to a reset. */ 
     58#define SCARD_W_UNPOWERED_CARD          0x80100067 /**< Power has been removed from the smart card, so that further communication is not possible. */ 
    5859#define SCARD_W_RESET_CARD              0x80100068 /**< The smart card has been reset, so any shared state information is invalid. */ 
    5960#define SCARD_W_REMOVED_CARD            0x80100069 /**< The smart card has been removed, so further communication is not possible. */ 

  • trunk/src/libopensc/internal.h

    r3115 r3405  
    3636#include "cards.h" 
    3737#include <assert.h> 
     38#ifdef _WIN32 
     39#include <windows.h> 
     40#endif 
    3841 
    3942#define SC_FILE_MAGIC                   0x14426950 

  • trunk/src/libopensc/log.c

    r3173 r3405  
    3636#endif 
    3737 
    38 #ifndef __GNUC__ 
    39 void sc_error(sc_context_t *ctx, const char *format, ...) 
     38/* Although not used, we need this for consistent exports */ 
     39void _sc_error(sc_context_t *ctx, const char *format, ...) 
    4040{ 
    4141        va_list ap; 
    … …  
    4646} 
    4747 
    48 void sc_debug(sc_context_t *ctx, const char *format, ...) 
     48/* Although not used, we need this for consistent exports */ 
     49void _sc_debug(sc_context_t *ctx, const char *format, ...) 
    4950{ 
    5051        va_list ap; 
    … …  
    5455        va_end(ap); 
    5556} 
    56  
    57 #endif 
    5857 
    5958void sc_do_log(sc_context_t *ctx, int type, const char *file, int line, const char *func, const char *format, ...) 

  • trunk/src/libopensc/log.h

    r3084 r3405  
    4545 
    4646#else 
    47  
    48 void sc_error(struct sc_context *ctx, const char *format, ...); 
    49 void sc_debug(struct sc_context *ctx, const char *format, ...); 
    50  
     47#define sc_error _sc_error 
     48#define sc_debug _sc_debug 
    5149#endif 
    5250 
     51void _sc_error(struct sc_context *ctx, const char *format, ...); 
     52void _sc_debug(struct sc_context *ctx, const char *format, ...); 
    5353void sc_do_log(struct sc_context *ctx, int type, const char *file, int line, const char *func, const char *format, ...); 
    5454void sc_do_log_va(struct sc_context *ctx, int type, const char *file, int line, const char *func, const char *format, va_list args); 

  • trunk/src/libopensc/opensc-config.in

    r196 r3405  
    1010# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
    1111 
     12version="@VERSION@" 
    1213 
    13 prefix=@prefix@ 
    14 exec_prefix=@exec_prefix@ 
     14prefix="@prefix@" 
     15exec_prefix="@exec_prefix@" 
    1516exec_prefix_set=no 
    1617 
    17 opensc_libs="@OPENSC_LIBS@" 
    18