153938 - i don't like #if defined(XP_PC) && !defined(XP_OS2)

Status: RESOLVED FIXED

(Core Graveyard :: Installer: XPInstall Engine, defect)

Description

[timeless]

Comment 1

[Mike Kaply [:mkaply]]

I don't either.

We have bugs and diffs for some of this stuff, but it never got checked in.

Someone just needs to give me blanket authority to change this stuff when I see 
it.

Comment 2

[Daniel Veditz [:dveditz]]

Feel free. I'll sr= any patches

Comment 3

[timeless]

Attachment: attempt to clean out this stuff

it looks like a few places don't handle BeOS or OS/2.

fwiw
#include <unistd.h> - BeOS
#include <netdb.h> - BONE
#include <sys/socket.h> - BONE
#include <arpa/inet.h> - BONE

I bet most platforms don't exercise this code

Comment 4

[Mike Kaply [:mkaply]]

I've done some porting in some of these files, so this patch needs updating.

Note, in the libxpnet files, I used __OS2__ to be consistent with the use of
_WINDOWS (compiler define rather than Mozilla define)

I think that this was done deliberately by the writer of libxpnet - I've no idea
why.

Also, I'd prefer #if defined(XP_WIN) || defined(XP_OS2) to
#ifdef XP_PC

Comment 5

[Mike Kaply [:mkaply]]

Attachment: Patch to just address issue in bug

Changing the _WINDOWS and other stuff isn't right.

This past JUST gets rid of XP_PC stuff.

In some cases, we had to do:

#ifdef XP_OS2
#elif defined(XP_PC)

for the OS/2 case - I fixed these as well to use XP_WIN and moved OS/2 to the
bottom.

Very simple patch.

Comment 6

[Daniel Veditz [:dveditz]]

Comment on attachment 111622 [details] [diff] [review]
Patch to just address issue in bug

sr=dveditz

Comment 7

[Mike Kaply [:mkaply]]

Fix checked in.