replace all TYPEDEF: void* XXX* with C-TYPE: XXX

db4
Joe Groff 2009-09-27 22:21:24 -05:00
parent 543ca72632
commit 866b62755e
23 changed files with 62 additions and 65 deletions

View File

@ -8,8 +8,8 @@ SPECIALIZED-ARRAY: void*
TYPEDEF: void* CFDictionaryRef TYPEDEF: void* CFDictionaryRef
TYPEDEF: void* CFMutableDictionaryRef TYPEDEF: void* CFMutableDictionaryRef
TYPEDEF: void* CFDictionaryKeyCallBacks* C-TYPE: CFDictionaryKeyCallBacks
TYPEDEF: void* CFDictionaryValueCallBacks* C-TYPE: CFDictionaryValueCallBacks
FUNCTION: CFDictionaryRef CFDictionaryCreate ( FUNCTION: CFDictionaryRef CFDictionaryCreate (
CFAllocatorRef allocator, CFAllocatorRef allocator,

View File

@ -6,7 +6,7 @@ IN: core-foundation.file-descriptors
TYPEDEF: void* CFFileDescriptorRef TYPEDEF: void* CFFileDescriptorRef
TYPEDEF: int CFFileDescriptorNativeDescriptor TYPEDEF: int CFFileDescriptorNativeDescriptor
TYPEDEF: void* CFFileDescriptorCallBack TYPEDEF: void* CFFileDescriptorCallBack
TYPEDEF: void* CFFileDescriptorContext* C-TYPE: CFFileDescriptorContext
FUNCTION: CFFileDescriptorRef CFFileDescriptorCreate ( FUNCTION: CFFileDescriptorRef CFFileDescriptorCreate (
CFAllocatorRef allocator, CFAllocatorRef allocator,

View File

@ -59,18 +59,18 @@ TYPEDEF: int PostgresPollingStatusType
TYPEDEF: int PGTransactionStatusType TYPEDEF: int PGTransactionStatusType
TYPEDEF: int PGVerbosity TYPEDEF: int PGVerbosity
TYPEDEF: void* PGconn* C-TYPE: PGconn
TYPEDEF: void* PGresult* C-TYPE: PGresult
TYPEDEF: void* PGcancel* C-TYPE: PGcancel
TYPEDEF: uint Oid TYPEDEF: uint Oid
TYPEDEF: uint* Oid* TYPEDEF: uint* Oid*
TYPEDEF: char pqbool TYPEDEF: char pqbool
TYPEDEF: void* PQconninfoOption* C-TYPE: PQconninfoOption
TYPEDEF: void* PGnotify* C-TYPE: PGnotify
TYPEDEF: void* PQArgBlock* C-TYPE: PQArgBlock
TYPEDEF: void* PQprintOpt* C-TYPE: PQprintOpt
TYPEDEF: void* SSL* C-TYPE: SSL
TYPEDEF: void* FILE* C-TYPE: FILE
LIBRARY: postgresql LIBRARY: postgresql

View File

@ -104,7 +104,7 @@ FUNCTION: void* BIO_f_buffer ( ) ;
CONSTANT: EVP_MAX_MD_SIZE 64 CONSTANT: EVP_MAX_MD_SIZE 64
TYPEDEF: void* EVP_MD* TYPEDEF: void* EVP_MD*
TYPEDEF: void* ENGINE* C-TYPE: ENGINE
STRUCT: EVP_MD_CTX STRUCT: EVP_MD_CTX
{ digest EVP_MD* } { digest EVP_MD* }

View File

@ -91,7 +91,7 @@ CONSTANT: SSL_ERROR_WANT_ACCEPT 8
TYPEDEF: void* ssl-method TYPEDEF: void* ssl-method
TYPEDEF: void* SSL_CTX* TYPEDEF: void* SSL_CTX*
TYPEDEF: void* SSL_SESSION* TYPEDEF: void* SSL_SESSION*
TYPEDEF: void* SSL* C-TYPE: SSL
LIBRARY: libssl LIBRARY: libssl
@ -101,7 +101,7 @@ LIBRARY: libssl
TYPEDEF: void* X509_NAME* TYPEDEF: void* X509_NAME*
TYPEDEF: void* X509* C-TYPE: X509
FUNCTION: int X509_NAME_get_text_by_NID ( X509_NAME* name, int nid, void* buf, int len ) ; FUNCTION: int X509_NAME_get_text_by_NID ( X509_NAME* name, int nid, void* buf, int len ) ;
FUNCTION: X509_NAME* X509_get_subject_name ( X509* a ) ; FUNCTION: X509_NAME* X509_get_subject_name ( X509* a ) ;

View File

@ -19,8 +19,8 @@ IN: pango.cairo
LIBRARY: pangocairo LIBRARY: pangocairo
TYPEDEF: void* PangoCairoFontMap* C-TYPE: PangoCairoFontMap
TYPEDEF: void* PangoCairoFont* C-TYPE: PangoCairoFont
FUNCTION: PangoFontMap* FUNCTION: PangoFontMap*
pango_cairo_font_map_new ( ) ; pango_cairo_font_map_new ( ) ;

View File

@ -15,14 +15,14 @@ PANGO_STYLE_OBLIQUE
PANGO_STYLE_ITALIC ; PANGO_STYLE_ITALIC ;
TYPEDEF: int PangoWeight TYPEDEF: int PangoWeight
TYPEDEF: void* PangoFont* C-TYPE: PangoFont
TYPEDEF: void* PangoFontFamily* C-TYPE: PangoFontFamily
TYPEDEF: void* PangoFontFace* C-TYPE: PangoFontFace
TYPEDEF: void* PangoFontMap* C-TYPE: PangoFontMap
TYPEDEF: void* PangoFontMetrics* C-TYPE: PangoFontMetrics
TYPEDEF: void* PangoFontDescription* C-TYPE: PangoFontDescription
TYPEDEF: void* PangoGlyphString* C-TYPE: PangoGlyphString
TYPEDEF: void* PangoLanguage* C-TYPE: PangoLanguage
CONSTANT: PANGO_WEIGHT_THIN 100 CONSTANT: PANGO_WEIGHT_THIN 100
CONSTANT: PANGO_WEIGHT_ULTRALIGHT 200 CONSTANT: PANGO_WEIGHT_ULTRALIGHT 200

View File

@ -10,9 +10,9 @@ IN: pango.layouts
LIBRARY: pango LIBRARY: pango
TYPEDEF: void* PangoLayout* C-TYPE: PangoLayout
TYPEDEF: void* PangoLayoutIter* C-TYPE: PangoLayoutIter
TYPEDEF: void* PangoLayoutLine* C-TYPE: PangoLayoutLine
FUNCTION: PangoLayout* FUNCTION: PangoLayout*
pango_layout_new ( PangoContext* context ) ; pango_layout_new ( PangoContext* context ) ;

View File

@ -23,7 +23,7 @@ CONSTANT: PANGO_SCALE 1024
: pango>float ( n -- x ) PANGO_SCALE /f ; inline : pango>float ( n -- x ) PANGO_SCALE /f ; inline
: float>pango ( x -- n ) PANGO_SCALE * >integer ; inline : float>pango ( x -- n ) PANGO_SCALE * >integer ; inline
TYPEDEF: void* PangoContext* C-TYPE: PangoContext
FUNCTION: PangoContext* pango_context_new ( ) ; FUNCTION: PangoContext* pango_context_new ( ) ;

View File

@ -37,11 +37,11 @@ TYPEDEF: fsfilcnt_t __fsfilcnt_t
TYPEDEF: __uint64_t rlim_t TYPEDEF: __uint64_t rlim_t
TYPEDEF: uint32_t id_t TYPEDEF: uint32_t id_t
TYPEDEF: void* DIR* C-TYPE: DIR
TYPEDEF: void* FILE* C-TYPE: FILE
TYPEDEF: void* rlimit* C-TYPE: rlimit
TYPEDEF: void* rusage* C-TYPE: rusage
TYPEDEF: void* sockaddr* C-TYPE: sockaddr
os { os {
{ linux [ "unix.types.linux" require ] } { linux [ "unix.types.linux" require ] }

View File

@ -4,7 +4,7 @@ USING: classes.struct alien.c-types alien.syntax ;
IN: vm IN: vm
TYPEDEF: void* cell TYPEDEF: void* cell
TYPEDEF: void* context* C-TYPE: context
STRUCT: zone STRUCT: zone
{ start cell } { start cell }

View File

@ -10,7 +10,7 @@ COM-INTERFACE: IUnknown f {00000000-0000-0000-C000-000000000046}
ULONG AddRef ( ) ULONG AddRef ( )
ULONG Release ( ) ; ULONG Release ( ) ;
TYPEDEF: void* IAdviseSink* C-TYPE: IAdviseSink
COM-INTERFACE: IDataObject IUnknown {0000010E-0000-0000-C000-000000000046} COM-INTERFACE: IDataObject IUnknown {0000010E-0000-0000-C000-000000000046}
HRESULT GetData ( FORMATETC* pFormatetc, STGMEDIUM* pmedium ) HRESULT GetData ( FORMATETC* pFormatetc, STGMEDIUM* pmedium )

View File

@ -58,7 +58,7 @@ STRUCT: SCRIPT_VISATTR
{ flags WORD } ; { flags WORD } ;
TYPEDEF: void* SCRIPT_CACHE* TYPEDEF: void* SCRIPT_CACHE*
TYPEDEF: void* ABC* C-TYPE: ABC
FUNCTION: HRESULT ScriptShape ( FUNCTION: HRESULT ScriptShape (
HDC hdc, HDC hdc,

View File

@ -105,7 +105,7 @@ CONSTANT: SD_BOTH 2
CONSTANT: SOL_SOCKET HEX: ffff CONSTANT: SOL_SOCKET HEX: ffff
TYPEDEF: void* sockaddr* C-TYPE: sockaddr
STRUCT: sockaddr-in STRUCT: sockaddr-in
{ family short } { family short }

View File

@ -31,12 +31,12 @@ TYPEDEF: XID KeySym
TYPEDEF: ulong Atom TYPEDEF: ulong Atom
TYPEDEF: char* XPointer TYPEDEF: char* XPointer
TYPEDEF: void* Screen* C-TYPE: Screen
TYPEDEF: void* GC TYPEDEF: void* GC
TYPEDEF: void* Visual* C-TYPE: Visual
TYPEDEF: void* XExtData* C-TYPE: XExtData
TYPEDEF: void* XFontProp* C-TYPE: XFontProp
TYPEDEF: void* XComposeStatus* C-TYPE: XComposeStatus
TYPEDEF: void* XIM TYPEDEF: void* XIM
TYPEDEF: void* XIC TYPEDEF: void* XIC
@ -47,9 +47,6 @@ TYPEDEF: int Bool
TYPEDEF: ulong VisualID TYPEDEF: ulong VisualID
TYPEDEF: ulong Time TYPEDEF: ulong Time
TYPEDEF: void* Window**
TYPEDEF: void* Atom**
ALIAS: <XID> <ulong> ALIAS: <XID> <ulong>
ALIAS: <Window> <XID> ALIAS: <Window> <XID>
ALIAS: <Drawable> <XID> ALIAS: <Drawable> <XID>

View File

@ -10,8 +10,8 @@ IN: curses.ffi
{ [ os unix? ] [ "libcurses.so" ] } { [ os unix? ] [ "libcurses.so" ] }
} cond "cdecl" add-library >> } cond "cdecl" add-library >>
TYPEDEF: void* WINDOW* C-TYPE: WINDOW
TYPEDEF: void* SCREEN* C-TYPE: SCREEN
TYPEDEF: void* va_list TYPEDEF: void* va_list
TYPEDEF: uint chtype TYPEDEF: uint chtype

View File

@ -38,8 +38,8 @@ TYPEDEF: long FT_F26Dot6
FUNCTION: FT_Error FT_Init_FreeType ( void* library ) ; FUNCTION: FT_Error FT_Init_FreeType ( void* library ) ;
! circular reference between glyph and face ! circular reference between glyph and face
TYPEDEF: void* face* C-TYPE: face
TYPEDEF: void* glyph* C-TYPE: glyph
STRUCT: glyph STRUCT: glyph
{ library void* } { library void* }

View File

@ -17,10 +17,10 @@ os {
LIBRARY: glu LIBRARY: glu
! These are defined as structs in glu.h, but we only ever use pointers to them ! These are defined as structs in glu.h, but we only ever use pointers to them
TYPEDEF: void* GLUnurbs* C-TYPE: GLUnurbs
TYPEDEF: void* GLUquadric* C-TYPE: GLUquadric
TYPEDEF: void* GLUtesselator* C-TYPE: GLUtesselator
TYPEDEF: void* GLubyte* C-TYPE: GLubyte
TYPEDEF: void* GLUfuncptr TYPEDEF: void* GLUfuncptr
! StringName ! StringName

View File

@ -6,8 +6,8 @@ IN: tokyo.alien.tchdb
LIBRARY: tokyocabinet LIBRARY: tokyocabinet
TYPEDEF: void* TCXSTR* C-TYPE: TCXSTR
TYPEDEF: void* TCHDB* C-TYPE: TCHDB
CONSTANT: HDBFOPEN 1 CONSTANT: HDBFOPEN 1
CONSTANT: HDBFFATAL 2 CONSTANT: HDBFFATAL 2

View File

@ -13,7 +13,7 @@ IN: tokyo.alien.tcrdb
LIBRARY: tokyotyrant LIBRARY: tokyotyrant
TYPEDEF: void* TCRDB* C-TYPE: TCRDB
! STRUCT: TCRDB ! STRUCT: TCRDB
! { mmtx pthread_mutex_t } ! { mmtx pthread_mutex_t }
! { eckey pthread_key_t } ! { eckey pthread_key_t }
@ -95,7 +95,7 @@ CONSTANT: RDBITOPT TDBITOPT
CONSTANT: RDBITVOID TDBITVOID CONSTANT: RDBITVOID TDBITVOID
CONSTANT: RDBITKEEP TDBITKEEP CONSTANT: RDBITKEEP TDBITKEEP
TYPEDEF: void* RDBQRY* C-TYPE: RDBQRY
! STRUCT: RDBQRY ! STRUCT: RDBQRY
! { rdb TCRDB* } ! { rdb TCRDB* }
! { args TCLIST* } ; ! { args TCLIST* } ;

View File

@ -6,9 +6,9 @@ IN: tokyo.alien.tctdb
LIBRARY: tokyocabinet LIBRARY: tokyocabinet
TYPEDEF: void* TDBIDX* C-TYPE: TDBIDX
TYPEDEF: void* TCTDB* C-TYPE: TCTDB
TYPEDEF: void* TCMAP* C-TYPE: TCMAP
CONSTANT: TDBFOPEN HDBFOPEN CONSTANT: TDBFOPEN HDBFOPEN
CONSTANT: TDBFFATAL HDBFFATAL CONSTANT: TDBFFATAL HDBFFATAL
@ -35,8 +35,8 @@ CONSTANT: TDBITOPT 9998
CONSTANT: TDBITVOID 9999 CONSTANT: TDBITVOID 9999
CONSTANT: TDBITKEEP 16777216 CONSTANT: TDBITKEEP 16777216
TYPEDEF: void* TDBCOND* C-TYPE: TDBCOND
TYPEDEF: void* TDBQRY* C-TYPE: TDBQRY
C-ENUM: C-ENUM:
TDBQCSTREQ TDBQCSTREQ

View File

@ -21,7 +21,7 @@ C-ENUM:
! FIXME: on windows 64bits this isn't correct, because long is 32bits there, and time_t is int64 ! FIXME: on windows 64bits this isn't correct, because long is 32bits there, and time_t is int64
TYPEDEF: long tokyo_time_t TYPEDEF: long tokyo_time_t
TYPEDEF: void* TCLIST* C-TYPE: TCLIST
FUNCTION: TCLIST* tclistnew ( ) ; FUNCTION: TCLIST* tclistnew ( ) ;
FUNCTION: TCLIST* tclistnew2 ( int anum ) ; FUNCTION: TCLIST* tclistnew2 ( int anum ) ;

View File

@ -19,7 +19,7 @@ TYPEDEF: int SQLINTEGER
TYPEDEF: char SQLCHAR TYPEDEF: char SQLCHAR
TYPEDEF: char* SQLCHAR* TYPEDEF: char* SQLCHAR*
TYPEDEF: void* SQLHANDLE TYPEDEF: void* SQLHANDLE
TYPEDEF: void* SQLHANDLE* C-TYPE: SQLHANDLE
TYPEDEF: void* SQLHENV TYPEDEF: void* SQLHENV
TYPEDEF: void* SQLHDBC TYPEDEF: void* SQLHDBC
TYPEDEF: void* SQLHSTMT TYPEDEF: void* SQLHSTMT