diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-25 23:08:37 +0200 |
| commit | 42f8488a5f66d7c1e5324bd1755d7f693b16ee97 (patch) | |
| tree | 54c7d2a62c4ea34b1250b5362c8e6f89d03f1a02 /security/nss/lib/util/utilpars.h | |
| parent | 681c39a0ecc84fc918b2bec72cc69ad27d39903a (diff) | |
| parent | 6c3f95480a191ce432ddfb2aa400a6d70c4884a8 (diff) | |
| download | UXP-2a055cb9fb575eb2bee092041b5abcae96f1bf03.tar UXP-2a055cb9fb575eb2bee092041b5abcae96f1bf03.tar.gz UXP-2a055cb9fb575eb2bee092041b5abcae96f1bf03.tar.lz UXP-2a055cb9fb575eb2bee092041b5abcae96f1bf03.tar.xz UXP-2a055cb9fb575eb2bee092041b5abcae96f1bf03.zip | |
Merge branch 'master' into Basilisk-releasev2018.04.26
Diffstat (limited to 'security/nss/lib/util/utilpars.h')
| -rw-r--r-- | security/nss/lib/util/utilpars.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/security/nss/lib/util/utilpars.h b/security/nss/lib/util/utilpars.h index 1b0b1ff1c..70767263a 100644 --- a/security/nss/lib/util/utilpars.h +++ b/security/nss/lib/util/utilpars.h @@ -59,11 +59,5 @@ char *NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal, char *_NSSUTIL_GetSecmodName(const char *param, NSSDBType *dbType, char **appName, char **filename, PRBool *rw); const char *_NSSUTIL_EvaluateConfigDir(const char *configdir, NSSDBType *dbType, char **app); -#if defined(_WIN32) -wchar_t *_NSSUTIL_UTF8ToWide(const char *buf); -PRStatus _NSSUTIL_Access(const char *path, PRAccessHow how); -#else -#define _NSSUTIL_Access(path, how) PR_Access((path), (how)) -#endif #endif /* _UTILPARS_H_ */ |