summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorragge <ragge@openbsd.org>2007-10-27 14:14:14 +0000
committerragge <ragge@openbsd.org>2007-10-27 14:14:14 +0000
commit6ae3accfa46e29e0c9d2d78e16fd95d6465b00e0 (patch)
tree255f7ea5f284ef8cb6d4177b705ecc55cf181b09
parentFrom master repo: Allow for less than 4 register classes. (diff)
downloadwireguard-openbsd-6ae3accfa46e29e0c9d2d78e16fd95d6465b00e0.tar.xz
wireguard-openbsd-6ae3accfa46e29e0c9d2d78e16fd95d6465b00e0.zip
Sync vith master repo: Remove lineid(), #ifdef for mirbsd wchar_t.
-rw-r--r--usr.bin/pcc/i386/local2.c9
-rw-r--r--usr.bin/pcc/i386/macdefs.h6
2 files changed, 6 insertions, 9 deletions
diff --git a/usr.bin/pcc/i386/local2.c b/usr.bin/pcc/i386/local2.c
index 95d654e7f8c..17d756ce90d 100644
--- a/usr.bin/pcc/i386/local2.c
+++ b/usr.bin/pcc/i386/local2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: local2.c,v 1.1 2007/10/22 13:39:37 otto Exp $ */
+/* $OpenBSD: local2.c,v 1.2 2007/10/27 14:14:14 ragge Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
@@ -36,13 +36,6 @@ int argsize(NODE *p);
static int stkpos;
void
-lineid(int l, char *fn)
-{
- /* identify line l and file fn */
- printf("# line %d, file %s\n", l, fn);
-}
-
-void
deflab(int label)
{
printf(LABFMT ":\n", label);
diff --git a/usr.bin/pcc/i386/macdefs.h b/usr.bin/pcc/i386/macdefs.h
index c7fb900466d..e6345c33314 100644
--- a/usr.bin/pcc/i386/macdefs.h
+++ b/usr.bin/pcc/i386/macdefs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: macdefs.h,v 1.1 2007/10/22 13:39:37 otto Exp $ */
+/* $OpenBSD: macdefs.h,v 1.2 2007/10/27 14:14:14 ragge Exp $ */
/*
* Copyright (c) 2003 Anders Magnusson (ragge@ludd.luth.se).
* All rights reserved.
@@ -90,7 +90,11 @@
/* Default char is signed */
#undef CHAR_UNSIGNED
#define BOOL_TYPE CHAR /* what used to store _Bool */
+#if os_mirbsd
+#define WCHAR_TYPE USHORT /* ISO 10646 16-bit Unicode */
+#else
#define WCHAR_TYPE INT /* what used to store wchar_t */
+#endif
/*
* Use large-enough types.