diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/euc.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/euc.h')
| -rw-r--r-- | usr/src/head/euc.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/usr/src/head/euc.h b/usr/src/head/euc.h index 4e6d4f90a9..ff4194eda4 100644 --- a/usr/src/head/euc.h +++ b/usr/src/head/euc.h @@ -19,6 +19,9 @@ * * CDDL HEADER END */ +/* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + */ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -26,24 +29,17 @@ #ifndef _EUC_H #define _EUC_H -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/euc.h> #ifdef __cplusplus extern "C" { #endif -#ifdef __STDC__ extern int csetcol(int n); /* Returns # of columns for codeset n. */ extern int csetlen(int n); /* Returns # of bytes excluding SSx. */ extern int euclen(const unsigned char *s); extern int euccol(const unsigned char *s); extern int eucscol(const unsigned char *str); -#else /* __STDC__ */ -extern int csetlen(), csetcol(); -extern int euclen(), euccol(), eucscol(); -#endif /* __STDC__ */ /* Returns code set number for the first byte of an EUC char. */ #define csetno(c) \ @@ -52,7 +48,6 @@ extern int euclen(), euccol(), eucscol(); /* * Copied from _wchar.h of SVR4 */ -#if defined(__STDC__) #define multibyte (__ctype[520] > 1) #define eucw1 __ctype[514] #define eucw2 __ctype[515] @@ -60,15 +55,6 @@ extern int euclen(), euccol(), eucscol(); #define scrw1 __ctype[517] #define scrw2 __ctype[518] #define scrw3 __ctype[519] -#else -#define multibyte (_ctype[520] > 1) -#define eucw1 _ctype[514] -#define eucw2 _ctype[515] -#define eucw3 _ctype[516] -#define scrw1 _ctype[517] -#define scrw2 _ctype[518] -#define scrw3 _ctype[519] -#endif #ifdef __cplusplus } |