Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VC6 compiler support changes, had to rename structure as now defined in system headers

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@6749 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blythe%netscape.com
1998-07-29 19:15:05 +00:00
parent f2f0d180f6
commit 0cf565fe00
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/cmd/winfe/prefs/brpref/public/ibrprefs.h
View File

@@ -131,10 +131,10 @@ typedef ISmartUpdatePrefs FAR* LPSMARTUPDATEPREFS;
#undef INTERFACE
#define INTERFACE ISmartUpdatePrefs
typedef struct _PACKAGEINFO {
typedef struct _SU_PACKAGEINFO {
char userPackageName[MAX_PATH];
char regPackageName[MAX_PATH];
} PACKAGEINFO, FAR *LPPACKAGEINFO;
} SU_PACKAGEINFO, FAR *LPSU_PACKAGEINFO;
// IBrowserPrefs provides the preference UI code with a way to get at
// various state maintained by the Navigator

10
mozilla/cmd/winfe/prefs/brpref/src/advpages.cpp
View File

@@ -644,8 +644,8 @@ CSmartUpdatePrefs::InitDialog()
LONG err;
void* context = NULL;
LPPACKAGEINFO packageInfo = new PACKAGEINFO;
LPPACKAGEINFO pInfo;
LPSU_PACKAGEINFO packageInfo = new PACKAGEINFO;
LPSU_PACKAGEINFO pInfo;
*(packageInfo->userPackageName) = '\0';
*(packageInfo->regPackageName) = '\0';
@@ -656,7 +656,7 @@ CSmartUpdatePrefs::InitDialog()
if (*(packageInfo->regPackageName) != '\0' &&
strcmp(packageInfo->regPackageName, UNINSTALL_NAV_STR) !=0 )
{
pInfo = new PACKAGEINFO;
pInfo = new SU_PACKAGEINFO;
if (*(packageInfo->userPackageName) != '\0') {
lstrcpy(pInfo->userPackageName, packageInfo->userPackageName);
} else {
@@ -708,7 +708,7 @@ CSmartUpdatePrefs::OnCommand(int id, HWND hwndCtl, UINT notifyCode)
return TRUE;
} else if (id == IDC_BUTTON2 && notifyCode == BN_CLICKED) {
LPPACKAGEINFO packageInfo = NULL;
LPSU_PACKAGEINFO packageInfo = NULL;
HWND hList = GetDlgItem(m_hwndDlg, IDC_LIST1);
int nIndex = 0;
int count = 0;
@@ -723,7 +723,7 @@ CSmartUpdatePrefs::OnCommand(int id, HWND hwndCtl, UINT notifyCode)
if (nIndex != LB_ERR) {
// Get the packageInfo data structure
packageInfo = (LPPACKAGEINFO)ListBox_GetItemData(hList, nIndex);
packageInfo = (LPSU_PACKAGEINFO)ListBox_GetItemData(hList, nIndex);
if (packageInfo != NULL) {
if (*(packageInfo->regPackageName) != '\0') {