256877 - nptypes.h for OpenBSD 3.5 (no stdint.h)

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Julien]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.0; fr-FR; rv:1.7.2) Gecko/20040803
Build Identifier: rv1.8a3

IN modules/plugin/base/public/nptypes.h
 61 #elif defined(bsdi) || defined(FREEBSD)
 62   /*
 63    * BSD/OS and FreeBSD ship sys/types.h that define int32_t and u_int32_t.
 64    */
 65   #include <sys/types.h>
 66 
 67   /*
 68    * BSD/OS ships no header that defines uint32_t, nor bool (for C)
 69    */
 70   #if defined(bsdi)
 71   typedef u_int32_t uint32_t;
 72 
 73   #if !defined(__cplusplus)
 74     typedef int bool;
 75   #endif
 76   #else
 77   /*
 78    * FreeBSD defines uint32_t and bool.
 79    */
 80     #include <inttypes.h>
 81     #include <stdbool.h>
 82   #endif
 83 #else

bsdi is not defined under openBSD and stdint.h doesn't exist
So i put:
 61 #elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
 62   /*
 63    * BSD/OS and FreeBSD ship sys/types.h that define int32_t and u_int32_t.
 64    */
 65   #include <sys/types.h>
 66 
 67   /*
 68    * BSD/OS ships no header that defines uint32_t, nor bool (for C)
 69    */
 70   #if defined(bsdi) || defined(OPENBSD)
 71   typedef u_int32_t uint32_t;
 72 
 73   #if !defined(__cplusplus)
 74     typedef int bool;
 75   #endif
 76   #else
 77   /*
 78    * FreeBSD defines uint32_t and bool.
 79    */
 80     #include <inttypes.h>
 81     #include <stdbool.h>
 82   #endif
 83 #else

Reproducible: Always
Steps to Reproduce:
1.
2.
3.

Comment 1

[jon rekai]

Attachment: reporter's changes with tweaks

OpenBSD's inttypes: 
http://www.openbsd.org/cgi-bin/cvsweb/~checkout~/src/include/inttypes.h?rev=1.5&content-type=text/plain


and its stdbool (which does provide a bool type as a macro which can be
redefined):
http://www.openbsd.org/cgi-bin/cvsweb/~checkout~/src/include/stdbool.h?rev=1.2&content-type=text/plain


Reporter's changes revised as follows:
To be "correct" with handling the bool, i.e. using OpenBSD's include, there
should be more conditionals in there (yuck).
The comments have been tweaked also.

I don't have an OpenBSD box to test this on, however (but it's free from issues
that'd prevent a successful FreeBSD build:)

ju1i3n, if you're interested in trying this patch out, please do.

Comment 2

[Johnny Stenback (:jst)]

Comment on attachment 157017 [details] [diff] [review]
reporter's changes with tweaks

r+sr+a=jst

Comment 3

[Johnny Stenback (:jst)]

Fix checked in on trunk and aviary branch.