mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

#188249 

r=me, sr=blizzard (platform specific)
Start landing GCC support for OS/2 - mainly cleanup to start
This commit is contained in:
mkaply%us.ibm.com 2003-03-21 21:36:11 +00:00
Родитель d6719582d1
Коммит 02e6723fc3
13 изменённых файлов: 23 добавлений и 22 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
xpinstall/wizard/os2/nsinstall/Makefile.in
Просмотреть файл

@ -47,7 +47,7 @@ include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_OS2_TOOLS),VACPP) ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDFLAGS += /PM:PM LDFLAGS += /PM:PM
else else
LDFLAGS += -ZLinker /PM:PM LDFLAGS += -Zlinker /PM:PM
endif endif
libs:: $(PROGRAM) libs:: $(PROGRAM)

2
xpinstall/wizard/os2/setup/Makefile.in
Просмотреть файл

@ -70,7 +70,7 @@ include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_OS2_TOOLS),VACPP) ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDFLAGS += /PM:PM LDFLAGS += /PM:PM
else else
LDFLAGS += -ZLinker /PM:PM LDFLAGS += -Zlinker /PM:PM
endif endif
libs:: $(PROGRAM) libs:: $(PROGRAM)

4
xpinstall/wizard/os2/setup/dialogs.c
Просмотреть файл

@ -1093,7 +1093,7 @@ MRESULT EXPENTRY DlgProcSelectComponents(HWND hDlg, ULONG msg, MPARAM mp1, MPARA
/* update the disk space available info in the dialog. GetDiskSpaceAvailable() /* update the disk space available info in the dialog. GetDiskSpaceAvailable()
returns value in kbytes */ returns value in kbytes */
ulDSBuf = GetDiskSpaceAvailable(sgProduct.szPath); ulDSBuf = GetDiskSpaceAvailable(sgProduct.szPath);
itoa(ulDSBuf, tchBuffer, 10); _itoa(ulDSBuf, tchBuffer, 10);
ParsePath(sgProduct.szPath, szBuf, sizeof(szBuf), FALSE, PP_ROOT_ONLY); ParsePath(sgProduct.szPath, szBuf, sizeof(szBuf), FALSE, PP_ROOT_ONLY);
RemoveBackSlash(szBuf); RemoveBackSlash(szBuf);
strcat(szBuf, " "); strcat(szBuf, " ");
@ -1129,7 +1129,7 @@ MRESULT EXPENTRY DlgProcSelectComponents(HWND hDlg, ULONG msg, MPARAM mp1, MPARA
/* update the disk space required info in the dialog. It is already /* update the disk space required info in the dialog. It is already
in Kilobytes */ in Kilobytes */
ulDSBuf = GetDiskSpaceRequired(DSR_DOWNLOAD_SIZE); ulDSBuf = GetDiskSpaceRequired(DSR_DOWNLOAD_SIZE);
itoa(ulDSBuf, tchBuffer, 10); _itoa(ulDSBuf, tchBuffer, 10);
strcpy(szBuf, tchBuffer); strcpy(szBuf, tchBuffer);
strcat(szBuf, " KB"); strcat(szBuf, " KB");

2
xpinstall/wizard/os2/setup/nsINIParser.cpp
Просмотреть файл

@ -514,7 +514,7 @@ find_end:
strncpy(aVal, currLine, nextEq-currLine); strncpy(aVal, currLine, nextEq-currLine);
aVal+= nextEq-currLine; aVal+= nextEq-currLine;
*aVal = \0; *aVal = '\0';
aVal++; aVal++;
currLine = nextNL + 1; currLine = nextNL + 1;

2
xpinstall/wizard/os2/setup/setup.h
Просмотреть файл

@ -43,7 +43,9 @@ typedef int PRInt32;
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
#ifdef XP_OS2_VACPP
#include <direct.h> #include <direct.h>
#endif
#include <ctype.h> #include <ctype.h>
#include "setuprsc.h" #include "setuprsc.h"
#include "resource.h" #include "resource.h"

2
xpinstall/wizard/os2/setup/xpi.c
Просмотреть файл

@ -165,7 +165,7 @@ char *GetErrorString(DWORD dwError, char *szErrorString, DWORD dwErrorStringSize
if(*XpErrorList[i] == '\0') if(*XpErrorList[i] == '\0')
break; break;
if(strcmpi(szErrorNumber, XpErrorList[i]) == 0) if(stricmp(szErrorNumber, XpErrorList[i]) == 0)
{ {
if(*XpErrorList[i + 1] != '\0') if(*XpErrorList[i + 1] != '\0')
strcpy(szErrorString, XpErrorList[i + 1]); strcpy(szErrorString, XpErrorList[i + 1]);

14
xpinstall/wizard/os2/setup/zipfile.h
Просмотреть файл

@ -51,21 +51,21 @@ PR_BEGIN_EXTERN_C
* If successful OpenArchive returns a handle in the hZip parameter * If successful OpenArchive returns a handle in the hZip parameter
* that must be passed to all subsequent operations on the archive * that must be passed to all subsequent operations on the archive
*/ */
extern _declspec(dllexport)int ZIP_OpenArchive( const char * zipname, void** hZip ); PR_EXTERN(int) ZIP_OpenArchive( const char * zipname, void** hZip );
extern _declspec(dllexport)int ZIP_CloseArchive( void** hZip ); PR_EXTERN(int) ZIP_CloseArchive( void** hZip );
/* Test the integrity of every item in this open archive /* Test the integrity of every item in this open archive
* by verifying each item's checksum against the stored * by verifying each item's checksum against the stored
* CRC32 value. * CRC32 value.
*/ */
extern _declspec(dllexport)int ZIP_TestArchive( void* hZip ); PR_EXTERN(int) ZIP_TestArchive( void* hZip );
/* Extract the named file in the archive to disk. /* Extract the named file in the archive to disk.
* This function will happily overwrite an existing Outfile if it can. * This function will happily overwrite an existing Outfile if it can.
* It's up to the caller to detect or move it out of the way if it's important. * It's up to the caller to detect or move it out of the way if it's important.
*/ */
extern _declspec(dllexport)int ZIP_ExtractFile( void* hZip, const char * filename, const char * outname ); PR_EXTERN(int) ZIP_ExtractFile( void* hZip, const char * filename, const char * outname );
/* Functions to list the files contained in the archive /* Functions to list the files contained in the archive
@ -82,9 +82,9 @@ extern _declspec(dllexport)int ZIP_ExtractFile( void* hZip, const char * filenam
* will return ZIP_ERR_SMALLBUF. When no more matches can be found in * will return ZIP_ERR_SMALLBUF. When no more matches can be found in
* the archive it will return ZIP_ERR_FNF * the archive it will return ZIP_ERR_FNF
*/ */
extern _declspec(dllexport)void* ZIP_FindInit( void* hZip, const char * pattern ); PR_EXTERN(void*) ZIP_FindInit( void* hZip, const char * pattern );
extern _declspec(dllexport)int ZIP_FindNext( void* hFind, char * outbuf, int bufsize ); PR_EXTERN(int) ZIP_FindNext( void* hFind, char * outbuf, int bufsize );
extern _declspec(dllexport)int ZIP_FindFree( void* hFind ); PR_EXTERN(int) ZIP_FindFree( void* hFind );
PR_END_EXTERN_C PR_END_EXTERN_C

2
xpinstall/wizard/os2/uninstall/Makefile.in
Просмотреть файл

@ -57,7 +57,7 @@ include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_OS2_TOOLS),VACPP) ifeq ($(MOZ_OS2_TOOLS),VACPP)
LDFLAGS += /PM:PM LDFLAGS += /PM:PM
else else
LDFLAGS += -ZLinker /PM:PM LDFLAGS += -Zlinker /PM:PM
endif endif
libs:: $(PROGRAM) libs:: $(PROGRAM)

3
xpinstall/wizard/os2/uninstall/ifuncns.c
Просмотреть файл

@ -22,8 +22,9 @@
* Sean Su <ssu@netscape.com> * Sean Su <ssu@netscape.com>
*/ */
#include "ifuncns.h" #include "uninstall.h"
#include "extra.h" #include "extra.h"
#include "ifuncns.h"
BOOL SearchForUninstallKeys(char *szStringToMatch) BOOL SearchForUninstallKeys(char *szStringToMatch)
{ {

2
xpinstall/wizard/os2/uninstall/nsINIParser.cpp
Просмотреть файл

@ -514,7 +514,7 @@ find_end:
strncpy(aVal, currLine, nextEq-currLine); strncpy(aVal, currLine, nextEq-currLine);
aVal+= nextEq-currLine; aVal+= nextEq-currLine;
*aVal = \0; *aVal = '\0';
aVal++; aVal++;
currLine = nextNL + 1; currLine = nextNL + 1;

4
xpinstall/wizard/os2/uninstall/parser.c
Просмотреть файл

@ -24,8 +24,8 @@
#include "extern.h" #include "extern.h"
#include "logkeys.h" #include "logkeys.h"
#include "parser.h"
#include "extra.h" #include "extra.h"
#include "parser.h"
#include "ifuncns.h" #include "ifuncns.h"
#include "dialogs.h" #include "dialogs.h"
@ -361,7 +361,7 @@ ULONG GetLogFile(PSZ szTargetPath, PSZ szInFilename, PSZ szOutBuf, ULONG dwOutBu
while(bFound) while(bFound)
{ {
memset(szNumber, 0, sizeof(szNumber)); memset(szNumber, 0, sizeof(szNumber));
if((strcmpi(fdFile.achName, ".") != 0) && (strcmpi(fdFile.achName, "..") != 0)) if((stricmp(fdFile.achName, ".") != 0) && (strcmpi(fdFile.achName, "..") != 0))
{ {
strcpy(szNumber, &fdFile.achName[iFilenameOnlyLen]); strcpy(szNumber, &fdFile.achName[iFilenameOnlyLen]);
ulNumber = atoi(szNumber); ulNumber = atoi(szNumber);

4
xpinstall/wizard/os2/uninstall/rdi.c
Просмотреть файл

@ -22,8 +22,8 @@
*/ */
#include "extern.h" #include "extern.h"
#include "parser.h"
#include "extra.h" #include "extra.h"
#include "parser.h"
#include "ifuncns.h" #include "ifuncns.h"
char szUnreadMailKey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail"; char szUnreadMailKey[] = "Software\\Microsoft\\Windows\\CurrentVersion\\UnreadMail";
@ -109,7 +109,7 @@ BOOL UndoDesktopIntegration(void)
/* Check to see if uninstall.ini has indicated to restore /* Check to see if uninstall.ini has indicated to restore
* the destktop integration performed by the browser/mail */ * the destktop integration performed by the browser/mail */
GetPrivateProfileString(szRDISection, "Enabled", "", szBuf, sizeof(szBuf), szFileIniUninstall); GetPrivateProfileString(szRDISection, "Enabled", "", szBuf, sizeof(szBuf), szFileIniUninstall);
if(strcmpi(szBuf, "TRUE") == 0) if(stricmp(szBuf, "TRUE") == 0)
{ {
RestoreDesktopIntegration(); RestoreDesktopIntegration();

2
xpinstall/wizard/os2/uninstall/uninstall.h
Просмотреть файл

@ -44,8 +44,6 @@ typedef int PRInt32;
#include <os2.h> #include <os2.h>
#include "nsINIParser.h" #include "nsINIParser.h"
typedef long HRESULT;
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>