← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gnupg2/vivid

« back to all changes in this revision

Viewing changes to common/init.c

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2013-05-24 18:27:04 UTC
  • mfrom: (18.1.2 ubuntu)
  • Revision ID: package-import@ubuntu.com-20130524182704-d9uwh9lrj91elnm6
* Resynchronize on Debian, remaining changes:
  - Add udev rules to give gpg access to some smartcard readers;
    Debian #543217.
    . debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers.
  - Add upstart user job for gpg-agent.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/init.c
25
25
#endif
26
26
 
27
27
#ifdef HAVE_W32_SYSTEM
 
28
# ifdef HAVE_WINSOCK2_H
 
29
#  include <winsock2.h>
 
30
# endif
28
31
#include <windows.h>
29
32
#endif
30
 
#ifdef HAVE_PTH      
 
33
#ifdef HAVE_PTH
31
34
#include <pth.h>
32
35
#endif
33
36
 
46
49
init_common_subsystems (void)
47
50
{
48
51
  /* Try to auto set the character set.  */
49
 
  set_native_charset (NULL); 
 
52
  set_native_charset (NULL);
50
53
 
51
54
#ifdef HAVE_W32_SYSTEM
52
55
  /* For W32 we need to initialize the socket layer.  This is because