mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-08-15 08:53:07 +09:00
6de8a0f12d
Compared with what Pale Moon had for Solaris originally, this is mostly the same zero point I started patching from, but I've made the following changes here after reviewing all this initial code I never looked at closely before. 1. In package-manifest.in for both Basilisk and Pale Moon, I've made the SPARC code for libfreebl not interefere with the x86 code, use the proper build flags, and also updated it to allow a SPARC64 build which is more likely to be used than the 32-bit SPARC code we had there. 2. See Mozilla bug #832272 and the old rules.mk patch from around Firefox 30 in oracle/solaris-userland. I believe they screwed up NSINSTALL on Solaris when they were trying to streamline the NSS buildsystem, because they started having unexplained issues with it around that time after Firefox 22 that they never properly resolved until Mozilla began building NSS with gyp files. I'm actually not even sure how relevant the thing they broke actually is to Solaris at this point, bug 665509 is so old it predates Firefox itself and goes back to the Mozilla suite days. I believe $(INSTALL) -t was wrong, and they meant $(NSINSTALL) -t because that makes more sense and is closer to what was there originally. It's what they have for WINNT, and it's possible a fix more like that could serve for Solaris as well. Alternatively, we could get rid of all these half-broken Makefiles and start building NSS with gyp files like Mozilla did. 3. I've completely cut out support for the Sun compiler and taken into account the reality that everyone builds Firefox (and therefore its forks) with GCC now on Solaris. This alone helped clean up a lot of the uglier parts of the code. 4. I've updated all remaining SOLARIS build flags to the newer XP_SOLARIS, because the SOLARIS flag is no longer set when building Solaris. 5. I've confirmed the workaround in gtxFontconfigFonts.cpp is no longer necessary. The Solaris people got impatient about implementing a half-baked patch for a fontconfig feature that wasn't ready yet back in 2009, and somehow convinced Mozilla to patch their software to work around it when really they should have just fixed or removed their broken fontconfig patch. The feature they wanted has since been implemented properly, and no version of Solaris still uses the broken patch that required this fix. If anyone had ever properly audited this code, it would have been removed a long time ago.
142 lines
3.2 KiB
C
142 lines
3.2 KiB
C
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef UPDATEDEFINES_H
|
|
#define UPDATEDEFINES_H
|
|
|
|
#include "readstrings.h"
|
|
|
|
#ifndef MAXPATHLEN
|
|
# ifdef PATH_MAX
|
|
# define MAXPATHLEN PATH_MAX
|
|
# elif defined(MAX_PATH)
|
|
# define MAXPATHLEN MAX_PATH
|
|
# elif defined(_MAX_PATH)
|
|
# define MAXPATHLEN _MAX_PATH
|
|
# elif defined(CCHMAXPATH)
|
|
# define MAXPATHLEN CCHMAXPATH
|
|
# else
|
|
# define MAXPATHLEN 1024
|
|
# endif
|
|
#endif
|
|
|
|
#if defined(XP_WIN)
|
|
# include <windows.h>
|
|
# include <shlwapi.h>
|
|
# include <direct.h>
|
|
# include <io.h>
|
|
# include <stdio.h>
|
|
# include <stdarg.h>
|
|
|
|
# ifndef F_OK
|
|
# define F_OK 00
|
|
# endif
|
|
# ifndef W_OK
|
|
# define W_OK 02
|
|
# endif
|
|
# ifndef R_OK
|
|
# define R_OK 04
|
|
# endif
|
|
# define S_ISDIR(s) (((s) & _S_IFMT) == _S_IFDIR)
|
|
# define S_ISREG(s) (((s) & _S_IFMT) == _S_IFREG)
|
|
|
|
# define access _access
|
|
|
|
# define putenv _putenv
|
|
# if defined(_MSC_VER) && _MSC_VER < 1900
|
|
# define stat _stat
|
|
# endif
|
|
# define DELETE_DIR L"tobedeleted"
|
|
# define CALLBACK_BACKUP_EXT L".moz-callback"
|
|
|
|
# define LOG_S "%S"
|
|
# define NS_T(str) L ## str
|
|
# define NS_SLASH NS_T('\\')
|
|
|
|
static inline int mywcsprintf(WCHAR* dest, size_t count, const WCHAR* fmt, ...)
|
|
{
|
|
size_t _count = count - 1;
|
|
va_list varargs;
|
|
va_start(varargs, fmt);
|
|
int result = _vsnwprintf(dest, count - 1, fmt, varargs);
|
|
va_end(varargs);
|
|
dest[_count] = L'\0';
|
|
return result;
|
|
}
|
|
#define NS_tsnprintf mywcsprintf
|
|
# define NS_taccess _waccess
|
|
# define NS_tchdir _wchdir
|
|
# define NS_tchmod _wchmod
|
|
# define NS_tfopen _wfopen
|
|
# define NS_tmkdir(path, perms) _wmkdir(path)
|
|
# define NS_tremove _wremove
|
|
// _wrename is used to avoid the link tracking service.
|
|
# define NS_trename _wrename
|
|
# define NS_trmdir _wrmdir
|
|
# define NS_tstat _wstat
|
|
# define NS_tlstat _wstat // No symlinks on Windows
|
|
# define NS_tstat_t _stat
|
|
# define NS_tstrcat wcscat
|
|
# define NS_tstrcmp wcscmp
|
|
# define NS_tstricmp wcsicmp
|
|
# define NS_tstrcpy wcscpy
|
|
# define NS_tstrncpy wcsncpy
|
|
# define NS_tstrlen wcslen
|
|
# define NS_tstrchr wcschr
|
|
# define NS_tstrrchr wcsrchr
|
|
# define NS_tstrstr wcsstr
|
|
# include "win_dirent.h"
|
|
# define NS_tDIR DIR
|
|
# define NS_tdirent dirent
|
|
# define NS_topendir opendir
|
|
# define NS_tclosedir closedir
|
|
# define NS_treaddir readdir
|
|
#else
|
|
# include <sys/wait.h>
|
|
# include <unistd.h>
|
|
|
|
#ifdef XP_SOLARIS
|
|
# include <sys/stat.h>
|
|
#else
|
|
# include <fts.h>
|
|
#endif
|
|
# include <dirent.h>
|
|
|
|
#ifdef XP_MACOSX
|
|
# include <sys/time.h>
|
|
#endif
|
|
|
|
# define LOG_S "%s"
|
|
# define NS_T(str) str
|
|
# define NS_SLASH NS_T('/')
|
|
# define NS_tsnprintf snprintf
|
|
# define NS_taccess access
|
|
# define NS_tchdir chdir
|
|
# define NS_tchmod chmod
|
|
# define NS_tfopen fopen
|
|
# define NS_tmkdir mkdir
|
|
# define NS_tremove remove
|
|
# define NS_trename rename
|
|
# define NS_trmdir rmdir
|
|
# define NS_tstat stat
|
|
# define NS_tstat_t stat
|
|
# define NS_tlstat lstat
|
|
# define NS_tstrcat strcat
|
|
# define NS_tstrcmp strcmp
|
|
# define NS_tstricmp strcasecmp
|
|
# define NS_tstrcpy strcpy
|
|
# define NS_tstrncpy strncpy
|
|
# define NS_tstrlen strlen
|
|
# define NS_tstrrchr strrchr
|
|
# define NS_tstrstr strstr
|
|
# define NS_tDIR DIR
|
|
# define NS_tdirent dirent
|
|
# define NS_topendir opendir
|
|
# define NS_tclosedir closedir
|
|
# define NS_treaddir readdir
|
|
#endif
|
|
|
|
#define BACKUP_EXT NS_T(".moz-backup")
|
|
|
|
#endif
|