8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 22:03:03 +01:00

extern cleaning

removing underscores in macros
DLL_EXPORT cleaning
Removing duplicated declarations
This commit is contained in:
brodsom 2003-10-03 01:50:54 +00:00
parent e65c42158e
commit e1c63c5dd0
4 changed files with 20 additions and 41 deletions

View File

@ -16,8 +16,8 @@
* All Rights Reserved. * All Rights Reserved.
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*/ */
#ifndef _JRD_KANJI_H_ #ifndef JRD_KANJI_H
#define _JRD_KANJI_H_ #define JRD_KANJI_H
#define SJIS1(uc) \ #define SJIS1(uc) \
((0x80 <= (UCHAR) ((uc) & 0xff) && (UCHAR) ((uc) & 0xff) <= 0x9f) || \ ((0x80 <= (UCHAR) ((uc) & 0xff) && (UCHAR) ((uc) & 0xff) <= 0x9f) || \
@ -31,25 +31,4 @@
#define KANJISHORT(s) (s & 0xff80) #define KANJISHORT(s) (s & 0xff80)
#define KANJI_MASK 0x80 #define KANJI_MASK 0x80
extern USHORT KANJI_check_euc(UCHAR *, USHORT); #endif // JRD_KANJI_H
extern USHORT KANJI_check_sjis(UCHAR *, USHORT);
extern USHORT KANJI_euc2sjis(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *);
extern USHORT KANJI_euc_byte2short(UCHAR *, USHORT *, USHORT);
extern USHORT KANJI_euc_len(UCHAR *, USHORT, USHORT *);
extern USHORT KANJI_sjis2euc(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *);
extern USHORT KANJI_sjis_byte2short(UCHAR *, USHORT *, USHORT);
extern USHORT KANJI_sjis2euc5(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *,
USHORT *, USHORT *);
extern USHORT KANJI_sjis_len(UCHAR *, USHORT, USHORT *);
/*extern USHORT KANJI_check_euc();
extern USHORT KANJI_check_sjis();
extern USHORT KANJI_euc2sjis();
extern USHORT KANJI_euc_byte2short();
extern USHORT KANJI_euc_len();
extern USHORT KANJI_sjis2euc();
extern USHORT KANJI_sjis2euc5();
extern USHORT KANJI_sjis_byte2short();
extern USHORT KANJI_sjis_len();*/
#endif /* _JRD_KANJI_H_ */

View File

@ -21,18 +21,18 @@
* Contributor(s): ______________________________________. * Contributor(s): ______________________________________.
*/ */
#ifndef _JRD_KANJI_PROTO_H_ #ifndef JRD_KANJI_PROTO_H
#define _JRD_KANJI_PROTO_H_ #define JRD_KANJI_PROTO_H
extern USHORT KANJI_check_euc(UCHAR *, USHORT); USHORT KANJI_check_euc(UCHAR *, USHORT);
extern USHORT KANJI_check_sjis(UCHAR *, USHORT); USHORT KANJI_check_sjis(UCHAR *, USHORT);
extern USHORT KANJI_euc2sjis(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *); USHORT KANJI_euc2sjis(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *);
extern USHORT KANJI_euc_byte2short(UCHAR *, USHORT *, USHORT); USHORT KANJI_euc_byte2short(UCHAR *, USHORT *, USHORT);
extern USHORT KANJI_euc_len(UCHAR *, USHORT, USHORT *); USHORT KANJI_euc_len(UCHAR *, USHORT, USHORT *);
extern USHORT KANJI_sjis2euc(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *); USHORT KANJI_sjis2euc(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *);
extern USHORT KANJI_sjis_byte2short(UCHAR *, USHORT *, USHORT); USHORT KANJI_sjis_byte2short(UCHAR *, USHORT *, USHORT);
extern USHORT KANJI_sjis2euc5(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *, USHORT KANJI_sjis2euc5(UCHAR *, USHORT, UCHAR *, USHORT, USHORT *,
USHORT *, USHORT *); USHORT *, USHORT *);
extern USHORT KANJI_sjis_len(UCHAR *, USHORT, USHORT *); USHORT KANJI_sjis_len(UCHAR *, USHORT, USHORT *);
#endif /* _JRD_KANJI_PROTO_H_ */ #endif // JRD_KANJI_PROTO_H

View File

@ -32,12 +32,12 @@
/* Commented out to make Linux version work because it is inaccessiable on all /* Commented out to make Linux version work because it is inaccessiable on all
known platforms. Nickolay Samofatov, 10 Sept 2002 known platforms. Nickolay Samofatov, 10 Sept 2002
extern void gds__log(UCHAR*, ...); void gds__log(UCHAR*, ...);
*/ */
#define EXTERN_texttype(name) extern USHORT name (TEXTTYPE, SSHORT, SSHORT) #define EXTERN_texttype(name) USHORT name (TEXTTYPE, SSHORT, SSHORT)
#define EXTERN_convert(name) extern USHORT name (CSCONVERT, SSHORT, SSHORT) #define EXTERN_convert(name) USHORT name (CSCONVERT, SSHORT, SSHORT)
#define EXTERN_charset(name) extern USHORT name (CHARSET, SSHORT, SSHORT) #define EXTERN_charset(name) USHORT name (CHARSET, SSHORT, SSHORT)
EXTERN_texttype(DOS101_init); EXTERN_texttype(DOS101_init);
EXTERN_texttype(DOS101_c2_init); EXTERN_texttype(DOS101_c2_init);

View File

@ -74,6 +74,6 @@ typedef USHORT UNICODE;
#define CHARSET_RETURN return (0) #define CHARSET_RETURN return (0)
extern void CV_convert_init(CSCONVERT, SSHORT, SSHORT, FPTR_SHORT, const void*, const void*); void CV_convert_init(CSCONVERT, SSHORT, SSHORT, FPTR_SHORT, const void*, const void*);
#endif /* _INTL_LDCOMMON_H_ */ #endif /* _INTL_LDCOMMON_H_ */