Show
Ignore:
Timestamp:
11/20/07 23:45:14 (1 year ago)
Author:
daboo
Message:

Merge of win32-merge branch.

Location:
Mulberry/trunk/Plug-ins/SMIME
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • Mulberry/trunk/Plug-ins/SMIME

    • Property svn:ignore

      •  

        old new  
        33.obj 
        44build 
         5Debug 
         6SMIME.vcproj.*.user 

  • Mulberry/trunk/Plug-ins/SMIME/sources/CSMIMEPluginDLL.h

    r54 r143  
    3737#include "cdstring.h" 
    3838 
     39#if __dest_os == __win32_os 
     40//#define USE_CMS 
     41#include <openssl/err.h> 
     42#include <openssl/pem.h> 
     43#include <openssl/ssl.h> 
     44#include <openssl/x509v3.h> 
     45#else 
    3946#include "openssl_.h" 
    40  
    41 #if __dest_os == __win32_os 
    42 #define USE_CMS 
    4347#endif 
    4448