X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fportab%2Fportab.h;h=78b6f7e126e66b870b7d9016e6b2a9d0575dd824;hb=c5da48368569383d064a2325ab3b99d10287a085;hp=a75aa34d03ca88eb878f35cba0c93af9a1b98974;hpb=2a7dd06ebd9cc72d45a6a4becdbef5213d7b7800;p=ngircd-alex.git

diff --git a/src/portab/portab.h b/src/portab/portab.h
index a75aa34d..78b6f7e1 100644
--- a/src/portab/portab.h
+++ b/src/portab/portab.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,28 +23,6 @@
 # define NDEBUG
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-# define NGIRC_GOT_INTTYPES
-#else
-# ifdef HAVE_STDINT_H
-#  include <stdint.h>
-#  define NGIRC_GOT_INTTYPES
-# endif
-#endif
-
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#endif
-
-#ifdef HAVE_STDBOOL_H
-# include <stdbool.h>
-#endif
-
 /* compiler features */
 
 #if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 7))
@@ -63,9 +41,24 @@
 # endif
 #endif
 
-
 /* datatypes */
 
+#include <sys/types.h>
+
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+# define NGIRC_GOT_INTTYPES
+#else
+# ifdef HAVE_STDINT_H
+#  include <stdint.h>
+#  define NGIRC_GOT_INTTYPES
+# endif
+#endif
+
 #ifndef PROTOTYPES
 # ifndef signed
 #  define signed
@@ -84,54 +77,56 @@ typedef unsigned short UINT16;
 typedef unsigned int UINT32;
 #endif
 
-#ifndef HAVE_STDBOOL_H
+#ifdef HAVE_STDBOOL_H
+# include <stdbool.h>
+#else
 typedef unsigned char bool;
-#define true (bool)1
-#define false (bool)0
+# define true (bool)1
+# define false (bool)0
 #endif
 
 #ifndef NULL
-#ifdef PROTOTYPES
-# define NULL (void *)0
-#else
-# define NULL 0L
-#endif
+# ifdef PROTOTYPES
+#  define NULL (void *)0
+# else
+#  define NULL 0L
+# endif
 #endif
 
 #ifdef NeXT
-#define S_IRUSR 0000400		/* read permission, owner */
-#define S_IWUSR 0000200		/* write permission, owner */
-#define S_IRGRP 0000040		/* read permission, group */
-#define S_IROTH 0000004		/* read permission, other */
-#define ssize_t int
+# define S_IRUSR 0000400		/* read permission, owner */
+# define S_IWUSR 0000200		/* write permission, owner */
+# define S_IRGRP 0000040		/* read permission, group */
+# define S_IROTH 0000004		/* read permission, other */
+# define ssize_t int
 #endif
 
 #undef GLOBAL
 #define GLOBAL
 
-
 /* SPLint */
 
-
 #ifdef S_SPLINT_S
-#include "splint.h"
+# include "splint.h"
 #endif
 
-
 /* target constants  */
 
-#ifndef TARGET_OS
-#define TARGET_OS "unknown"
+#ifndef HOST_OS
+# define HOST_OS "unknown"
 #endif
 
-#ifndef TARGET_CPU
-#define TARGET_CPU "unknown"
+#ifndef HOST_CPU
+# define HOST_CPU "unknown"
 #endif
 
-#ifndef TARGET_VENDOR
-#define TARGET_VENDOR "unknown"
+#ifndef HOST_VENDOR
+# define HOST_VENDOR "unknown"
 #endif
 
+#ifdef __HAIKU__
+# define SINGLE_USER_OS
+#endif
 
 /* configure options */
 
@@ -155,6 +150,10 @@ extern size_t strlcpy PARAMS(( char *dst, const char *src, size_t size ));
 extern char * strdup PARAMS(( const char *s ));
 #endif
 
+#ifndef HAVE_STRNDUP
+extern char * strndup PARAMS((const char *s, size_t maxlen));
+#endif
+
 #ifndef HAVE_STRTOK_R
 extern char * strtok_r PARAMS((char *str, const char *delim, char **saveptr));
 #endif
@@ -164,16 +163,18 @@ extern char * strtok_r PARAMS((char *str, const char *delim, char **saveptr));
 extern int vsnprintf PARAMS(( char *str, size_t count, const char *fmt, va_list args ));
 #endif
 
+#ifndef HAVE_GAI_STRERROR
+# define gai_strerror(r) "unknown error"
+#endif
+
 #ifndef PACKAGE_NAME
-#define PACKAGE_NAME PACKAGE
+# define PACKAGE_NAME PACKAGE
 #endif
 
 #ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION VERSION
+# define PACKAGE_VERSION VERSION
 #endif
 
-
 #endif
 
-
 /* -eof- */