Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
2010-04-30 Anders Carlsson <andersca@apple.com>
        Reviewed by Dan Bernstein.

        Final part of

        https://bugs.webkit.org/show_bug.cgi?id=20784
        move npapi.h to C99 integer types

        * bridge/npapi.h:
        Remove the old types.


Canonical link: https://commits.webkit.org/49853@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58598 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Anders Carlsson committed Apr 30, 2010
1 parent e4ae6b1 commit 2377848
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 48 deletions.
12 changes: 12 additions & 0 deletions WebCore/ChangeLog
@@ -1,3 +1,15 @@
2010-04-30 Anders Carlsson <andersca@apple.com>

Reviewed by Dan Bernstein.

Final part of

https://bugs.webkit.org/show_bug.cgi?id=20784
move npapi.h to C99 integer types

* bridge/npapi.h:
Remove the old types.

2010-04-30 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r58569.
Expand Down
50 changes: 2 additions & 48 deletions WebCore/bridge/npapi.h
Expand Up @@ -129,52 +129,6 @@
/* Definition of Basic Types */
/*----------------------------------------------------------------------*/

/* QNX sets the _INT16 and friends defines, but does not typedef the types */
#ifdef __QNXNTO__
#undef _UINT16
#undef _INT16
#undef _UINT32
#undef _INT32
#endif

#ifndef _UINT16
#define _UINT16
typedef unsigned short uint16;
#endif

#ifndef _UINT32
#define _UINT32
#ifdef __LP64__
typedef unsigned int uint32;
#else /* __LP64__ */
typedef unsigned long uint32;
#endif /* __LP64__ */
#endif

#ifndef _INT16
#define _INT16
typedef short int16;
#endif

#ifndef _INT32
#define _INT32
#ifdef __LP64__
typedef int int32;
#else /* __LP64__ */
typedef long int32;
#endif /* __LP64__ */
#endif

#ifndef FALSE
#define FALSE (0)
#endif
#ifndef TRUE
#define TRUE (1)
#endif
#ifndef NULL
#define NULL (0L)
#endif

typedef unsigned char NPBool;
typedef int16_t NPError;
typedef int16_t NPReason;
Expand Down Expand Up @@ -679,8 +633,8 @@ typedef struct NP_GLContext
typedef struct NP_Port
{
CGrafPtr port; /* Grafport */
int32 portx; /* position inside the topmost window */
int32 porty;
int32_t portx; /* position inside the topmost window */
int32_t porty;
} NP_Port;

#endif /* NP_NO_QUICKDRAW */
Expand Down

0 comments on commit 2377848

Please sign in to comment.