summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorRuss Allbery <rra@stanford.edu>2007-10-04 23:21:58 +0000
committerRuss Allbery <rra@stanford.edu>2007-10-04 23:21:58 +0000
commitf09ec713c68c4c9b0c6dd89090fc9ce4e9d93042 (patch)
treed1289b0bb8e4f0018ec4c254622e4b0584195bc9 /util
parent9ff667addf39128f43d08d4ec56a6a94ec3bb062 (diff)
Update runtests to the latest version. Fix various other missing or
incorrect makefile and configure rules and some include issues so that the portability layer compiles and passes its test suite.
Diffstat (limited to 'util')
-rw-r--r--util/util.h26
1 files changed, 1 insertions, 25 deletions
diff --git a/util/util.h b/util/util.h
index e2fce86..386bdd5 100644
--- a/util/util.h
+++ b/util/util.h
@@ -20,35 +20,11 @@
#define UTIL_UTIL_H 1
#include <config.h>
-#include <portable/gssapi.h>
-
-#include <stdarg.h>
-#include <sys/types.h>
-
-/* __attribute__ is available in gcc 2.5 and later, but only with gcc 2.7
- could you use the __format__ form of the attributes, which is what we use
- (to avoid confusion with other macros). */
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-# define __attribute__(spec) /* empty */
-# endif
-#endif
+#include <system.h>
/* Used for unused parameters to silence gcc warnings. */
#define UNUSED __attribute__((__unused__))
-/* BEGIN_DECLS is used at the beginning of declarations so that C++
- compilers don't mangle their names. END_DECLS is used at the end. */
-#undef BEGIN_DECLS
-#undef END_DECLS
-#ifdef __cplusplus
-# define BEGIN_DECLS extern "C" {
-# define END_DECLS }
-#else
-# define BEGIN_DECLS /* empty */
-# define END_DECLS /* empty */
-#endif
-
BEGIN_DECLS
/* Forward declarations to avoid includes. */