diff options
| author | DRC <information@libjpeg-turbo.org> | 2024-01-16 19:30:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-16 19:30:34 +0000 |
| commit | e822c5dbe953d45bad9731111e6d2e06991f7c97 (patch) | |
| tree | c26e744ad70a3c45d33e81d86db901833c19cc33 | |
| parent | b13eedbad305592addb37bdc398c404cb9182ab1 (diff) | |
| parent | 4fcb3d575b6522058e38adbcd79456e224800bb6 (diff) | |
| download | libjpeg-turbo-e822c5dbe953d45bad9731111e6d2e06991f7c97.tar.gz | |
Fix build warnings/errs w/ -DNO_GETENV/-DNO_PUTENV am: 8dba43af7a am: 4fcb3d575b
Original change: https://android-review.googlesource.com/c/platform/external/libjpeg-turbo/+/2901154
Change-Id: Icb9e14af43ab5a1c358a67788705bbd65ce2b7b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | README.android | 2 | ||||
| -rw-r--r-- | jinclude.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/README.android b/README.android index b2003e8e..36563562 100644 --- a/README.android +++ b/README.android @@ -13,3 +13,5 @@ backwards compatibility since it's not really costing us anything. We `#define` these in jconfig.h rather than in Android.bp so that they're correctly exported to any *users* (in particular, jerror.h only conditionally defines the corresponding error codes if these `#define`s are present). + +Cherry-pick on 2024/01/08: https://github.com/libjpeg-turbo/libjpeg-turbo/commit/c27695a193a7cb265ef8e45c7b28bda3a71c70ce @@ -4,7 +4,7 @@ * This file was part of the Independent JPEG Group's software: * Copyright (C) 1991-1994, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2022, D. R. Commander. + * Copyright (C) 2022-2023, D. R. Commander. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -123,6 +123,8 @@ static INLINE int GETENV_S(char *buffer, size_t buffer_size, const char *name) #else +#include <errno.h> + /* This provides a similar interface to the Microsoft _putenv_s() function, but * other than parameter validation, it has no advantages over setenv(). */ |