[openssl/openssl] ed634b: djgpp: Inherit config from BASE_unix

[jwt27]

  Branch: refs/heads/openssl-3.0
  Home:   https://github.com/openssl/openssl
  Commit: ed634b1ea4e1826916dee97674fd09b5446139cb
      https://github.com/openssl/openssl/commit/ed634b1ea4e1826916dee97674fd09b5446139cb
  Author: J.W. Jagersma <jwjagersma at gmail.com>
  Date:   2022-09-29 (Thu, 29 Sep 2022)

  Changed paths:
    M Configurations/50-djgpp.conf

  Log Message:
  -----------
  djgpp: Inherit config from BASE_unix

Build failed on djgpp due to missing config vars 'AR' and 'ARFLAGS'.
Additionally, '-lz' was not added to 'lflags' when zlib support was
enabled.  Inheriting configuration variables from BASE_unix solves both
these issues.

CLA: trivial

Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19274)

(cherry picked from commit 29d82bd95b6ef3428c7e776221612a083994219d)


  Commit: 7adcdb2a5144d826e2e74c019aa80a9d7eb6bcda
      https://github.com/openssl/openssl/commit/7adcdb2a5144d826e2e74c019aa80a9d7eb6bcda
  Author: J.W. Jagersma <jwjagersma at gmail.com>
  Date:   2022-09-29 (Thu, 29 Sep 2022)

  Changed paths:
    M e_os.h

  Log Message:
  -----------
  djgpp: Use usleep() for ossl_sleep()

This part failed to compile due to a circular dependency between
internal/e_os.h and internal/time.h, when ossl_sleep() falls back to a
busy wait.  However, djgpp has a usleep function, so it can use the
regular Unix version of ossl_sleep().

It's not great though.  The resolution is only ~55ms, and it may break
when a user program hooks the timer interrupt without periodically
updating BIOS time.  A high-resolution alternative is uclock(), but
that is generally less desirable since it reprograms the system timer.

The circular dependency is still there and may still cause trouble for
other platforms.

CLA: trivial

Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19274)

(cherry picked from commit 651255941c49a5089dfc011f2abd636433da8b82)


  Commit: 8a7e4f1177c83df5814d4c3de7054ccbdf9f0507
      https://github.com/openssl/openssl/commit/8a7e4f1177c83df5814d4c3de7054ccbdf9f0507
  Author: J.W. Jagersma <jwjagersma at gmail.com>
  Date:   2022-09-29 (Thu, 29 Sep 2022)

  Changed paths:
    M include/internal/sockets.h

  Log Message:
  -----------
  djgpp: Define WATT32_NO_OLDIES before including socket headers

If this macro is left undefined, Watt-32 will "helpfully" declare some
typedefs such as 'byte' and 'word' in the global namespace.  This broke
compilation of apps/s_client.c.

CLA: trivial

Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Tomas Mraz <tomas at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19274)

(cherry picked from commit 8ae74c5bc091e7388c082f090c1fde992c31320f)


Compare: https://github.com/openssl/openssl/compare/8ff66343bdf6...8a7e4f1177c8