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

diff --git a/basis/core-foundation/dictionaries/dictionaries.factor b/basis/core-foundation/dictionaries/dictionaries.factor
index 04b5aacb39e1e991a1bc4bc94e7f80888c3036f6..fc0e98a2150462aa53de192ed2d8f3fb82076181 100644 (file)
--- a/basis/core-foundation/dictionaries/dictionaries.factor
+++ b/basis/core-foundation/dictionaries/dictionaries.factor
@@ -8,8 +8,8 @@ SPECIALIZED-ARRAY: void*
 
 TYPEDEF: void* CFDictionaryRef
 TYPEDEF: void* CFMutableDictionaryRef
-TYPEDEF: void* CFDictionaryKeyCallBacks*
-TYPEDEF: void* CFDictionaryValueCallBacks*
+C-TYPE: CFDictionaryKeyCallBacks
+C-TYPE: CFDictionaryValueCallBacks
 
 FUNCTION: CFDictionaryRef CFDictionaryCreate (
    CFAllocatorRef allocator,

diff --git a/basis/core-foundation/file-descriptors/file-descriptors.factor b/basis/core-foundation/file-descriptors/file-descriptors.factor
index 2520f1c3dab2dfcceff792e448da640367128b22..ec5581d4633237cd40d36912344401ae4e90b303 100644 (file)
--- a/basis/core-foundation/file-descriptors/file-descriptors.factor
+++ b/basis/core-foundation/file-descriptors/file-descriptors.factor
@@ -6,7 +6,7 @@ IN: core-foundation.file-descriptors
 TYPEDEF: void* CFFileDescriptorRef
 TYPEDEF: int CFFileDescriptorNativeDescriptor
 TYPEDEF: void* CFFileDescriptorCallBack
-TYPEDEF: void* CFFileDescriptorContext*
+C-TYPE: CFFileDescriptorContext
 
 FUNCTION: CFFileDescriptorRef CFFileDescriptorCreate (
     CFAllocatorRef allocator,

diff --git a/basis/db/postgresql/ffi/ffi.factor b/basis/db/postgresql/ffi/ffi.factor
index 88618c6212b841b910b6881d2adcc55a1490eff5..f4a55e32807e33358522fdf0e53ab00d6da33129 100644 (file)
--- a/basis/db/postgresql/ffi/ffi.factor
+++ b/basis/db/postgresql/ffi/ffi.factor
@@ -59,18 +59,18 @@ TYPEDEF: int PostgresPollingStatusType
 TYPEDEF: int PGTransactionStatusType 
 TYPEDEF: int PGVerbosity 
 
-TYPEDEF: void* PGconn*
-TYPEDEF: void* PGresult*
-TYPEDEF: void* PGcancel*
+C-TYPE: PGconn
+C-TYPE: PGresult
+C-TYPE: PGcancel
 TYPEDEF: uint Oid
 TYPEDEF: uint* Oid*
 TYPEDEF: char pqbool
-TYPEDEF: void* PQconninfoOption*
-TYPEDEF: void* PGnotify*
-TYPEDEF: void* PQArgBlock*
-TYPEDEF: void* PQprintOpt*
-TYPEDEF: void* SSL*
-TYPEDEF: void* FILE*
+C-TYPE: PQconninfoOption
+C-TYPE: PGnotify
+C-TYPE: PQArgBlock
+C-TYPE: PQprintOpt
+C-TYPE: SSL
+C-TYPE: FILE
 
 LIBRARY: postgresql
 

diff --git a/basis/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor
index ed280ecd691b1648eac830975021e860f126e550..dbc5b9e43cdf08c839c18cf7f4dcbffa62df952c 100644 (file)
--- a/basis/openssl/libcrypto/libcrypto.factor
+++ b/basis/openssl/libcrypto/libcrypto.factor
@@ -104,7 +104,7 @@ FUNCTION: void* BIO_f_buffer (  ) ;
 CONSTANT: EVP_MAX_MD_SIZE 64
 
 TYPEDEF: void* EVP_MD*
-TYPEDEF: void* ENGINE*
+C-TYPE: ENGINE
 
 STRUCT: EVP_MD_CTX
     { digest EVP_MD* }

diff --git a/basis/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor
index 9e2b13159a2bf5b0c0eba85288b5e6cdf6a202ed..225d4b3da1b580fbb8a15301215ea0636babf5a8 100644 (file)
--- a/basis/openssl/libssl/libssl.factor
+++ b/basis/openssl/libssl/libssl.factor
@@ -91,7 +91,7 @@ CONSTANT: SSL_ERROR_WANT_ACCEPT      8
 TYPEDEF: void* ssl-method
 TYPEDEF: void* SSL_CTX*
 TYPEDEF: void* SSL_SESSION*
-TYPEDEF: void* SSL*
+C-TYPE: SSL
 
 LIBRARY: libssl
 
@@ -101,7 +101,7 @@ LIBRARY: libssl
 
 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: X509_NAME* X509_get_subject_name ( X509* a ) ;

diff --git a/basis/pango/cairo/cairo.factor b/basis/pango/cairo/cairo.factor
index 2ad730ee6e32a1cca77fd48d7475746272e49eec..6fd8d57893183c9855b8a62acfed36ea752d2046 100644 (file)
--- a/basis/pango/cairo/cairo.factor
+++ b/basis/pango/cairo/cairo.factor
@@ -19,8 +19,8 @@ IN: pango.cairo
 
 LIBRARY: pangocairo
 
-TYPEDEF: void* PangoCairoFontMap*
-TYPEDEF: void* PangoCairoFont*
+C-TYPE: PangoCairoFontMap
+C-TYPE: PangoCairoFont
 
 FUNCTION: PangoFontMap*
 pango_cairo_font_map_new ( ) ;

diff --git a/basis/pango/fonts/fonts.factor b/basis/pango/fonts/fonts.factor
index eb3e2208b1ce90c9faf7fe0cb2e6fd9312c7f96c..280ddd20d6257881971dc915d05200bbe3ff9d8d 100644 (file)
--- a/basis/pango/fonts/fonts.factor
+++ b/basis/pango/fonts/fonts.factor
@@ -15,14 +15,14 @@ PANGO_STYLE_OBLIQUE
 PANGO_STYLE_ITALIC ;
 
 TYPEDEF: int PangoWeight
-TYPEDEF: void* PangoFont*
-TYPEDEF: void* PangoFontFamily*
-TYPEDEF: void* PangoFontFace*
-TYPEDEF: void* PangoFontMap*
-TYPEDEF: void* PangoFontMetrics*
-TYPEDEF: void* PangoFontDescription*
-TYPEDEF: void* PangoGlyphString*
-TYPEDEF: void* PangoLanguage*
+C-TYPE: PangoFont
+C-TYPE: PangoFontFamily
+C-TYPE: PangoFontFace
+C-TYPE: PangoFontMap
+C-TYPE: PangoFontMetrics
+C-TYPE: PangoFontDescription
+C-TYPE: PangoGlyphString
+C-TYPE: PangoLanguage
 
 CONSTANT: PANGO_WEIGHT_THIN 100
 CONSTANT: PANGO_WEIGHT_ULTRALIGHT 200

diff --git a/basis/pango/layouts/layouts.factor b/basis/pango/layouts/layouts.factor
index a03d26fb6782b8d20c4b45afcff164aef610b963..74b6d0b0c3934d84fbc145a1750a4f4933e98c8d 100644 (file)
--- a/basis/pango/layouts/layouts.factor
+++ b/basis/pango/layouts/layouts.factor
@@ -10,9 +10,9 @@ IN: pango.layouts
 
 LIBRARY: pango
 
-TYPEDEF: void* PangoLayout*
-TYPEDEF: void* PangoLayoutIter*
-TYPEDEF: void* PangoLayoutLine*
+C-TYPE: PangoLayout
+C-TYPE: PangoLayoutIter
+C-TYPE: PangoLayoutLine
 
 FUNCTION: PangoLayout*
 pango_layout_new ( PangoContext* context ) ;

diff --git a/basis/pango/pango.factor b/basis/pango/pango.factor
index 03134ed7871ac348c23397218dd010afaf0b5487..6dc48e39fe261e4c682ac6fcf5de1998393a7e68 100644 (file)
--- a/basis/pango/pango.factor
+++ b/basis/pango/pango.factor
@@ -23,7 +23,7 @@ CONSTANT: PANGO_SCALE 1024
 : pango>float ( n -- x ) PANGO_SCALE /f ; inline
 : float>pango ( x -- n ) PANGO_SCALE * >integer ; inline
 
-TYPEDEF: void* PangoContext*
+C-TYPE: PangoContext
 
 FUNCTION: PangoContext* pango_context_new ( ) ;
 

diff --git a/basis/unix/types/types.factor b/basis/unix/types/types.factor
index 6fdaeef8cf477cc8fc8ce68d66e6496718ea1378..7650e9962f64af74f762d0e4b6af93d02e777916 100644 (file)
--- a/basis/unix/types/types.factor
+++ b/basis/unix/types/types.factor
@@ -37,11 +37,11 @@ TYPEDEF: fsfilcnt_t __fsfilcnt_t
 TYPEDEF: __uint64_t rlim_t
 TYPEDEF: uint32_t id_t
 
-TYPEDEF: void* DIR*
-TYPEDEF: void* FILE*
-TYPEDEF: void* rlimit*
-TYPEDEF: void* rusage*
-TYPEDEF: void* sockaddr*
+C-TYPE: DIR
+C-TYPE: FILE
+C-TYPE: rlimit
+C-TYPE: rusage
+C-TYPE: sockaddr
 
 os {
     { linux   [ "unix.types.linux"   require ] }

diff --git a/basis/vm/vm.factor b/basis/vm/vm.factor
index 728cbb83d8743c9ba202a517c9c0eff4a26a6141..11d9dabb3d9a812abf9c55f10991c32ce5a2440a 100644 (file)
--- a/basis/vm/vm.factor
+++ b/basis/vm/vm.factor
@@ -4,7 +4,7 @@ USING: classes.struct alien.c-types alien.syntax ;
 IN: vm
 
 TYPEDEF: void* cell
-TYPEDEF: void* context*
+C-TYPE: context
 
 STRUCT: zone
     { start cell }

diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor
index 45a74e225008d1a349542ad01ca45d66a2d029dc..9628b890fb2754e630ca083030c54cc073c3069d 100755 (executable)
--- a/basis/windows/com/com.factor
+++ b/basis/windows/com/com.factor
@@ -10,7 +10,7 @@ COM-INTERFACE: IUnknown f {00000000-0000-0000-C000-000000000046}
     ULONG AddRef ( )
     ULONG Release ( ) ;
 
-TYPEDEF: void* IAdviseSink*
+C-TYPE: IAdviseSink
 
 COM-INTERFACE: IDataObject IUnknown {0000010E-0000-0000-C000-000000000046}
     HRESULT GetData ( FORMATETC* pFormatetc, STGMEDIUM* pmedium )

diff --git a/basis/windows/usp10/usp10.factor b/basis/windows/usp10/usp10.factor
index f021b552899cfc5843894ba61329ee0002879080..57702d8780f53084f788dc636bb50e298fdf01de 100755 (executable)
--- a/basis/windows/usp10/usp10.factor
+++ b/basis/windows/usp10/usp10.factor
@@ -58,7 +58,7 @@ STRUCT: SCRIPT_VISATTR
     { flags WORD } ;
 
 TYPEDEF: void* SCRIPT_CACHE*
-TYPEDEF: void* ABC*
+C-TYPE: ABC
 
 FUNCTION: HRESULT ScriptShape (
     HDC hdc,

diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor
index b50fadb5bac578bafe598ad3337d0cb36deefbac..7bd86c8e47e14fb65c4845306a159dba517ec602 100755 (executable)
--- a/basis/windows/winsock/winsock.factor
+++ b/basis/windows/winsock/winsock.factor
@@ -105,7 +105,7 @@ CONSTANT: SD_BOTH 2
 
 CONSTANT: SOL_SOCKET HEX: ffff
 
-TYPEDEF: void* sockaddr*
+C-TYPE: sockaddr
 
 STRUCT: sockaddr-in
     { family short }

diff --git a/basis/x11/xlib/xlib.factor b/basis/x11/xlib/xlib.factor
index 2b90b1bff276fb367b85bcddf45be4b69beaad00..a6097c9dadde2fab2fec0c4ae01eda8ae7500338 100644 (file)
--- a/basis/x11/xlib/xlib.factor
+++ b/basis/x11/xlib/xlib.factor
@@ -31,12 +31,12 @@ TYPEDEF: XID KeySym
 TYPEDEF: ulong Atom
 
 TYPEDEF: char* XPointer
-TYPEDEF: void* Screen*
+C-TYPE: Screen
 TYPEDEF: void* GC
-TYPEDEF: void* Visual*
-TYPEDEF: void* XExtData*
-TYPEDEF: void* XFontProp*
-TYPEDEF: void* XComposeStatus*
+C-TYPE: Visual
+C-TYPE: XExtData
+C-TYPE: XFontProp
+C-TYPE: XComposeStatus
 TYPEDEF: void* XIM
 TYPEDEF: void* XIC
 
@@ -47,9 +47,6 @@ TYPEDEF: int Bool
 TYPEDEF: ulong VisualID
 TYPEDEF: ulong Time
 
-TYPEDEF: void* Window**
-TYPEDEF: void* Atom**
-
 ALIAS: <XID> <ulong>
 ALIAS: <Window> <XID>
 ALIAS: <Drawable> <XID>

diff --git a/extra/curses/ffi/ffi.factor b/extra/curses/ffi/ffi.factor
index 4eb01e913c7bd787beab0510368b9d2529794423..9a5802e73e6b67c4104738f689263c27ac2e84e9 100644 (file)
--- a/extra/curses/ffi/ffi.factor
+++ b/extra/curses/ffi/ffi.factor
@@ -10,8 +10,8 @@ IN: curses.ffi
     { [ os unix?  ]  [ "libcurses.so" ] }
 } cond "cdecl" add-library >>
 
-TYPEDEF: void* WINDOW*
-TYPEDEF: void* SCREEN*
+C-TYPE: WINDOW
+C-TYPE: SCREEN
 TYPEDEF: void* va_list
 
 TYPEDEF: uint chtype

diff --git a/extra/freetype/freetype.factor b/extra/freetype/freetype.factor
index 6105381f86cec6618098b22c5c7349b3302cf02f..23dd62b3401133ff39b76756e522ad541b6852b9 100644 (file)
--- a/extra/freetype/freetype.factor
+++ b/extra/freetype/freetype.factor
@@ -38,8 +38,8 @@ TYPEDEF: long FT_F26Dot6
 FUNCTION: FT_Error FT_Init_FreeType ( void* library ) ;
 
 ! circular reference between glyph and face
-TYPEDEF: void* face*
-TYPEDEF: void* glyph*
+C-TYPE: face
+C-TYPE: glyph
 
 STRUCT: glyph
     { library void* }

diff --git a/extra/opengl/glu/glu.factor b/extra/opengl/glu/glu.factor
index a62745cb6aab473cb87b1f219634bbe2b9b7984b..6409a3781b97368fac4b1ad8c87840f66be0d28d 100644 (file)
--- a/extra/opengl/glu/glu.factor
+++ b/extra/opengl/glu/glu.factor
@@ -17,10 +17,10 @@ os {
 LIBRARY: glu
  
 ! These are defined as structs in glu.h, but we only ever use pointers to them
-TYPEDEF: void* GLUnurbs*
-TYPEDEF: void* GLUquadric*
-TYPEDEF: void* GLUtesselator*
-TYPEDEF: void* GLubyte*
+C-TYPE: GLUnurbs
+C-TYPE: GLUquadric
+C-TYPE: GLUtesselator
+C-TYPE: GLubyte
 TYPEDEF: void* GLUfuncptr
 
 ! StringName

diff --git a/extra/tokyo/alien/tchdb/tchdb.factor b/extra/tokyo/alien/tchdb/tchdb.factor
index b9503bdab4a74910dfd2bacc2a529953459885a0..fd0464fcec0ab00d12f007f13d5a0dca58949c31 100755 (executable)
--- a/extra/tokyo/alien/tchdb/tchdb.factor
+++ b/extra/tokyo/alien/tchdb/tchdb.factor
@@ -6,8 +6,8 @@ IN: tokyo.alien.tchdb
 
 LIBRARY: tokyocabinet
 
-TYPEDEF: void* TCXSTR*
-TYPEDEF: void* TCHDB*
+C-TYPE: TCXSTR
+C-TYPE: TCHDB
 
 CONSTANT: HDBFOPEN  1
 CONSTANT: HDBFFATAL 2

diff --git a/extra/tokyo/alien/tcrdb/tcrdb.factor b/extra/tokyo/alien/tcrdb/tcrdb.factor
index 0450e6522c5e963bb5b45ac48ed3a0e6f6d2e6f0..a6e59dbe032b8cd73324689455e0e1bfa6391751 100755 (executable)
--- a/extra/tokyo/alien/tcrdb/tcrdb.factor
+++ b/extra/tokyo/alien/tcrdb/tcrdb.factor
@@ -13,7 +13,7 @@ IN: tokyo.alien.tcrdb
 
 LIBRARY: tokyotyrant
 
-TYPEDEF: void* TCRDB*
+C-TYPE: TCRDB
 ! STRUCT: TCRDB
 !     { mmtx pthread_mutex_t }
 !     { eckey pthread_key_t }
@@ -95,7 +95,7 @@ CONSTANT: RDBITOPT     TDBITOPT
 CONSTANT: RDBITVOID    TDBITVOID
 CONSTANT: RDBITKEEP    TDBITKEEP
 
-TYPEDEF: void* RDBQRY*
+C-TYPE: RDBQRY
 ! STRUCT: RDBQRY
 !     { rdb TCRDB* }
 !     { args TCLIST* } ;

diff --git a/extra/tokyo/alien/tctdb/tctdb.factor b/extra/tokyo/alien/tctdb/tctdb.factor
index 8373a6aaaaf5be22e7aeb323cfc53dec5b5df369..9e8071d0dfc81a5d365a19e1eb849b0eaa8fb58a 100755 (executable)
--- a/extra/tokyo/alien/tctdb/tctdb.factor
+++ b/extra/tokyo/alien/tctdb/tctdb.factor
@@ -6,9 +6,9 @@ IN: tokyo.alien.tctdb
 
 LIBRARY: tokyocabinet
 
-TYPEDEF: void* TDBIDX*
-TYPEDEF: void* TCTDB*
-TYPEDEF: void* TCMAP*
+C-TYPE: TDBIDX
+C-TYPE: TCTDB
+C-TYPE: TCMAP
 
 CONSTANT: TDBFOPEN  HDBFOPEN
 CONSTANT: TDBFFATAL HDBFFATAL
@@ -35,8 +35,8 @@ CONSTANT: TDBITOPT  9998
 CONSTANT: TDBITVOID 9999
 CONSTANT: TDBITKEEP 16777216
 
-TYPEDEF: void* TDBCOND*
-TYPEDEF: void* TDBQRY*
+C-TYPE: TDBCOND
+C-TYPE: TDBQRY
 
 C-ENUM:
     TDBQCSTREQ

diff --git a/extra/tokyo/alien/tcutil/tcutil.factor b/extra/tokyo/alien/tcutil/tcutil.factor
index ac6e242be219a1db2d5c57f8e06d5b5d8032290f..7cb6c5e09218bf170491e1ba343a00491f445408 100755 (executable)
--- a/extra/tokyo/alien/tcutil/tcutil.factor
+++ b/extra/tokyo/alien/tcutil/tcutil.factor
@@ -21,7 +21,7 @@ C-ENUM:
 ! FIXME: on windows 64bits this isn't correct, because long is 32bits there, and time_t is int64
 TYPEDEF: long tokyo_time_t
 
-TYPEDEF: void* TCLIST*
+C-TYPE: TCLIST
 
 FUNCTION: TCLIST* tclistnew ( ) ;
 FUNCTION: TCLIST* tclistnew2 ( int anum ) ;

diff --git a/unmaintained/odbc/odbc.factor b/unmaintained/odbc/odbc.factor
index 267c7be312d6640e401a269758b3f183927f1614..06d47b8937542bf6c4da3facc7e3081b355b2ce7 100644 (file)
--- a/unmaintained/odbc/odbc.factor
+++ b/unmaintained/odbc/odbc.factor
@@ -19,7 +19,7 @@ TYPEDEF: int SQLINTEGER
 TYPEDEF: char SQLCHAR
 TYPEDEF: char* SQLCHAR*
 TYPEDEF: void* SQLHANDLE
-TYPEDEF: void* SQLHANDLE*
+C-TYPE: SQLHANDLE
 TYPEDEF: void* SQLHENV
 TYPEDEF: void* SQLHDBC
 TYPEDEF: void* SQLHSTMT