[Heimdal-source-changes] [heimdal/heimdal] 62f797: Fix Windows build (inc. roken.h before assert.h)

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/heimdal/heimdal
  Commit: 62f797ed4ef669da29da77196bec71dbecbca4b0
      https://github.com/heimdal/heimdal/commit/62f797ed4ef669da29da77196bec71dbecbca4b0
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M lib/hcrypto/evp-pkcs11.c

  Log Message:
  -----------
  Fix Windows build (inc. roken.h before assert.h)

The build was failing at lib/hcrypto/evp-pkcs11.c because roken.h was
being included after <assert.h>.  It's not clear why that would be a
problem.

Here are some of the errors and warnings that resulted from including
<roken.h> after <assert.h> in evp-pkcs11.c:

evp-pkcs11.c                                                                                                                                      C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\ws2def.h(91) : warning C4005: 'AF_IPX' : macro redefinition                           s              C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\winsock.h(460) : see previous definition of 'AF_IPX'
C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\ws2def.h(124) : warning C4005: 'AF_MAX' : macro redefinition
  C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\winsock.h(479) : see previous definition of 'AF_MAX'
C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\ws2def.h(168) : warning C4005: 'SO_DONTLINGER' : macro redefinition
  C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\winsock.h(402) : see previous definition of 'SO_DONTLINGER'
C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\ws2def.h(212) : error C2011: 'sockaddr' : 'struct' type redefinition
  C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\winsock.h(485) : see declaration of 'sockaddr'
C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\ws2def.h(390) : error C2059: syntax error : 'constant'
C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\ws2def.h(524) : warning C4005: 'IN_CLASSA' : macro redefinition
  C:\Program Files\Microsoft SDKs\Windows\v7.1\INCLUDE\winsock.h(287) : see previous definition of 'IN_CLASSA'


  Commit: 78343d09074f6f10c48b5a0f26daf74d8b72adb0
      https://github.com/heimdal/heimdal/commit/78343d09074f6f10c48b5a0f26daf74d8b72adb0
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M lib/hcrypto/libhcrypto-exports.def

  Log Message:
  -----------
  Fix Windows tests: add missing hcrypto export


  Commit: 971ccce043de1cc3fbedabb540e6954744652baa
      https://github.com/heimdal/heimdal/commit/971ccce043de1cc3fbedabb540e6954744652baa
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M configure.ac

  Log Message:
  -----------
  Detect fork et al for kdc


  Commit: 4f87d85d659a6d1913790bb66864a66ebfabc3df
      https://github.com/heimdal/heimdal/commit/4f87d85d659a6d1913790bb66864a66ebfabc3df
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-20 (Wed, 20 Jan 2016)

  Changed paths:
    M kdc/connect.c
    M kdc/headers.h
    M kdc/main.c

  Log Message:
  -----------
  Fix Windows build: no fork for kdc


  Commit: a6e36356b5d10d78693efc081b997b55ca351dfb
      https://github.com/heimdal/heimdal/commit/a6e36356b5d10d78693efc081b997b55ca351dfb
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M kdc/connect.c

  Log Message:
  -----------
  KDC: fix C-style


  Commit: 1575f4f69a997f96eee9be1eed8c7cfab02135f0
      https://github.com/heimdal/heimdal/commit/1575f4f69a997f96eee9be1eed8c7cfab02135f0
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M kdc/connect.c

  Log Message:
  -----------
  KDC: Don't confuse master process with master


  Commit: cfd51be7fe729aae30dfbd167f397d57cade6db0
      https://github.com/heimdal/heimdal/commit/cfd51be7fe729aae30dfbd167f397d57cade6db0
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M NTMakefile
    A appveyor.yml
    M packages/windows/assembly/NTMakefile

  Log Message:
  -----------
  Add appveyor.yml for Windows CI via Appveyor

Appveyor is like Travis-CI, but for Windows.

Since it seems impossible to install texinfo, this elides building docs
for now.


  Commit: a5f13331af56acf83b7f7994a765a092f18842c1
      https://github.com/heimdal/heimdal/commit/a5f13331af56acf83b7f7994a765a092f18842c1
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M NTMakefile
    M appveyor.yml
    M doc/NTMakefile

  Log Message:
  -----------
  Appveyor: workaround perl texinfo


  Commit: 1830d8c876402b340e94e5b5a51b8053b40d7b00
      https://github.com/heimdal/heimdal/commit/1830d8c876402b340e94e5b5a51b8053b40d7b00
  Author: Nicolas Williams <nico at cryptonector.com>
  Date:   2016-01-21 (Thu, 21 Jan 2016)

  Changed paths:
    M packages/windows/assembly/NTMakefile

  Log Message:
  -----------
  Appveyor: get past package manifest validation

This is just a hack to get Appveyor builds to complete successfully.
Eventually we should get packages and installers to build correctly, and
even for x86 and x86_64 combined.  But it's early days and this is
useful enough.


Compare: https://github.com/heimdal/heimdal/compare/bfd72f9ed558...1830d8c87640