From 5768ae0af4db3311539c463e5d467639cfd7db4d Mon Sep 17 00:00:00 2001
From: Erik Charlebois <erikcharlebois@gmail.com>
Date: Sat, 10 Apr 2010 00:12:59 -0700
Subject: [PATCH] Forget to save some files for enum change

---
 basis/cairo/ffi/ffi.factor                        | 15 +++++----------
 basis/cocoa/application/application.factor        |  2 +-
 basis/unicode/breaks/breaks.factor                |  4 ++--
 basis/vm/vm.factor                                |  2 +-
 basis/windows/advapi32/advapi32.factor            | 12 ++++--------
 basis/windows/ddk/hid/hid.factor                  |  6 ++----
 basis/windows/ddk/setupapi/setupapi.factor        |  3 +--
 .../directx/d3dx9shader/d3dx9shader.factor        |  6 ++----
 basis/windows/directx/xaudio2/xaudio2.factor      |  3 +--
 9 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/basis/cairo/ffi/ffi.factor b/basis/cairo/ffi/ffi.factor
index 42b281c33c..01e89aaf3c 100644
--- a/basis/cairo/ffi/ffi.factor
+++ b/basis/cairo/ffi/ffi.factor
@@ -694,8 +694,7 @@ cairo_surface_get_reference_count ( cairo_surface_t* surface ) ;
 FUNCTION: cairo_status_t
 cairo_surface_status ( cairo_surface_t* surface ) ;
 
-TYPEDEF: int cairo_surface_type_t
-C-ENUM:
+C-ENUM: cairo_surface_type_t
     CAIRO_SURFACE_TYPE_IMAGE
     CAIRO_SURFACE_TYPE_PDF
     CAIRO_SURFACE_TYPE_PS
@@ -758,8 +757,7 @@ cairo_surface_show_page ( cairo_surface_t* surface ) ;
 
 ! Image-surface functions
 
-TYPEDEF: int cairo_format_t
-C-ENUM:
+C-ENUM: cairo_format_t
     CAIRO_FORMAT_ARGB32
     CAIRO_FORMAT_RGB24
     CAIRO_FORMAT_A8
@@ -831,8 +829,7 @@ cairo_pattern_get_user_data ( cairo_pattern_t* pattern, cairo_user_data_key_t* k
 FUNCTION: cairo_status_t
 cairo_pattern_set_user_data ( cairo_pattern_t* pattern, cairo_user_data_key_t* key, void* user_data, cairo_destroy_func_t destroy ) ;
 
-TYPEDEF: int cairo_pattern_type_t
-C-ENUM:
+C-ENUM: cairo_pattern_type_t
     CAIRO_PATTERN_TYPE_SOLID
     CAIRO_PATTERN_TYPE_SURFACE
     CAIRO_PATTERN_TYPE_LINEAR
@@ -853,8 +850,7 @@ cairo_pattern_set_matrix ( cairo_pattern_t* pattern, cairo_matrix_t* matrix ) ;
 FUNCTION: void
 cairo_pattern_get_matrix ( cairo_pattern_t* pattern, cairo_matrix_t* matrix ) ;
 
-TYPEDEF: int cairo_extend_t
-C-ENUM:
+C-ENUM: cairo_extend_t
     CAIRO_EXTEND_NONE
     CAIRO_EXTEND_REPEAT
     CAIRO_EXTEND_REFLECT
@@ -866,8 +862,7 @@ cairo_pattern_set_extend ( cairo_pattern_t* pattern, cairo_extend_t extend ) ;
 FUNCTION: cairo_extend_t
 cairo_pattern_get_extend ( cairo_pattern_t* pattern ) ;
 
-TYPEDEF: int cairo_filter_t
-C-ENUM:
+C-ENUM: cairo_filter_t
     CAIRO_FILTER_FAST
     CAIRO_FILTER_GOOD
     CAIRO_FILTER_BEST
diff --git a/basis/cocoa/application/application.factor b/basis/cocoa/application/application.factor
index df56ce5c4c..6768e1471d 100644
--- a/basis/cocoa/application/application.factor
+++ b/basis/cocoa/application/application.factor
@@ -8,7 +8,7 @@ IN: cocoa.application
 
 : <NSString> ( str -- alien ) <CFString> -> autorelease ;
 
-C-ENUM:
+C-ENUM: f
 NSApplicationDelegateReplySuccess
 NSApplicationDelegateReplyCancel
 NSApplicationDelegateReplyFailure ;
diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor
index 46651bd7de..2ab8b27cc7 100644
--- a/basis/unicode/breaks/breaks.factor
+++ b/basis/unicode/breaks/breaks.factor
@@ -12,7 +12,7 @@ IN: unicode.breaks
 <PRIVATE
 ! Grapheme breaks
 
-C-ENUM: Any L V T LV LVT Extend Control CR LF
+C-ENUM: f Any L V T LV LVT Extend Control CR LF
     SpacingMark Prepend graphemes ;
 
 : jamo-class ( ch -- class )
@@ -131,7 +131,7 @@ VALUE: word-break-table
 "vocab:unicode/data/WordBreakProperty.txt" load-interval-file
 to: word-break-table
 
-C-ENUM: wOther wCR wLF wNewline wExtend wFormat wKatakana wALetter wMidLetter
+C-ENUM: f wOther wCR wLF wNewline wExtend wFormat wKatakana wALetter wMidLetter
 wMidNum wMidNumLet wNumeric wExtendNumLet words ;
 
 : word-break-classes ( -- table ) ! Is there a way to avoid this?
diff --git a/basis/vm/vm.factor b/basis/vm/vm.factor
index b4c5734810..cef6e9348d 100644
--- a/basis/vm/vm.factor
+++ b/basis/vm/vm.factor
@@ -34,7 +34,7 @@ STRUCT: vm
 
 : vm-field-offset ( field -- offset ) vm offset-of ; inline
 
-C-ENUM:
+C-ENUM: f
 collect-nursery-op
 collect-aging-op
 collect-to-tenured-op
diff --git a/basis/windows/advapi32/advapi32.factor b/basis/windows/advapi32/advapi32.factor
index 1e6a1c0b0b..e463725b2f 100755
--- a/basis/windows/advapi32/advapi32.factor
+++ b/basis/windows/advapi32/advapi32.factor
@@ -155,21 +155,18 @@ C-ENUM: ACCESS_MODE
     SET_AUDIT_SUCCESS
     SET_AUDIT_FAILURE ;
 
-TYPEDEF: DWORD MULTIPLE_TRUSTEE_OPERATION
-C-ENUM:
+C-ENUM: MULTIPLE_TRUSTEE_OPERATION
     NO_MULTIPLE_TRUSTEE
     TRUSTEE_IS_IMPERSONATE ;
 
-TYPEDEF: DWORD TRUSTEE_FORM
-C-ENUM:
+C-ENUM: TRUSTEE_FORM
   TRUSTEE_IS_SID
   TRUSTEE_IS_NAME
   TRUSTEE_BAD_FORM
   TRUSTEE_IS_OBJECTS_AND_SID
   TRUSTEE_IS_OBJECTS_AND_NAME ;
 
-TYPEDEF: DWORD TRUSTEE_TYPE
-C-ENUM:
+C-ENUM: TRUSTEE_TYPE
     TRUSTEE_IS_UNKNOWN
     TRUSTEE_IS_USER
     TRUSTEE_IS_GROUP
@@ -180,8 +177,7 @@ C-ENUM:
     TRUSTEE_IS_INVALID
     TRUSTEE_IS_COMPUTER ;
 
-TYPEDEF: DWORD SE_OBJECT_TYPE
-C-ENUM:
+C-ENUM: SE_OBJECT_TYPE
     SE_UNKNOWN_OBJECT_TYPE
     SE_FILE_OBJECT
     SE_SERVICE
diff --git a/basis/windows/ddk/hid/hid.factor b/basis/windows/ddk/hid/hid.factor
index 9c8a55ee7c..6c760fd014 100644
--- a/basis/windows/ddk/hid/hid.factor
+++ b/basis/windows/ddk/hid/hid.factor
@@ -206,11 +206,10 @@ CONSTANT: HID_USAGE_DIGITIZER_BARREL_SWITCH HEX: 44
 CONSTANT: HIDP_LINK_COLLECTION_ROOT        -1
 CONSTANT: HIDP_LINK_COLLECTION_UNSPECIFIED 0
 
-C-ENUM:
+C-ENUM: HIDP_REPORT_TYPE
     HidP_Input
     HidP_Output
     HidP_Feature ;
-TYPEDEF: int HIDP_REPORT_TYPE
 
 STRUCT: USAGE_AND_PAGE
     { Usage     USAGE }
@@ -608,10 +607,9 @@ HidP_UsageAndPageListDifference (
    ULONG           UsageListLength
    ) ;
 
-C-ENUM:
+C-ENUM: HIDP_KEYBOARD_DIRECTION
     HidP_Keyboard_Break
     HidP_Keyboard_Make ;
-TYPEDEF: int HIDP_KEYBOARD_DIRECTION
 
 STRUCT: HIDP_KEYBOARD_MODIFIER_STATE
     { ul ULONG } ;
diff --git a/basis/windows/ddk/setupapi/setupapi.factor b/basis/windows/ddk/setupapi/setupapi.factor
index 06d32725f7..f328950648 100644
--- a/basis/windows/ddk/setupapi/setupapi.factor
+++ b/basis/windows/ddk/setupapi/setupapi.factor
@@ -1515,14 +1515,13 @@ FUNCTION: BOOL SetupRemoveFileLogEntryA ( HSPFILELOG FileLogHandle, PCSTR LogSec
 FUNCTION: BOOL SetupRemoveFileLogEntryW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR TargetFilename ) ;
 ALIAS: SetupRemoveFileLogEntry SetupRemoveFileLogEntryW
 
-C-ENUM:
+C-ENUM: SetupFileLogInfo
     SetupFileLogSourceFilename
     SetupFileLogChecksum
     SetupFileLogDiskTagfile
     SetupFileLogDiskDescription
     SetupFileLogOtherInfo
     SetupFileLogMax ;
-TYPEDEF: int SetupFileLogInfo
 
 FUNCTION: BOOL SetupQueryFileLogA ( HSPFILELOG FileLogHandle, PCSTR LogSectionName, PCSTR TargetFilename, SetupFileLogInfo DesiredInfo, PSTR DataOut, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
 FUNCTION: BOOL SetupQueryFileLogW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR TargetFilename, SetupFileLogInfo DesiredInfo, PWSTR DataOut, DWORD ReturnBufferSize, PDWORD RequiredSize ) ;
diff --git a/basis/windows/directx/d3dx9shader/d3dx9shader.factor b/basis/windows/directx/d3dx9shader/d3dx9shader.factor
index 4490acc7c9..00844338b5 100644
--- a/basis/windows/directx/d3dx9shader/d3dx9shader.factor
+++ b/basis/windows/directx/d3dx9shader/d3dx9shader.factor
@@ -57,7 +57,7 @@ C-ENUM: D3DXPARAMETER_CLASS
     D3DXPC_STRUCT ;
 TYPEDEF: D3DXPARAMETER_CLASS* LPD3DXPARAMETER_CLASS
 
-C-ENUM:
+C-ENUM: D3DXPARAMETER_TYPE
     D3DXPT_VOID
     D3DXPT_BOOL
     D3DXPT_INT
@@ -78,7 +78,6 @@ C-ENUM:
     D3DXPT_PIXELFRAGMENT
     D3DXPT_VERTEXFRAGMENT
     D3DXPT_UNSUPPORTED ;
-TYPEDEF: int D3DXPARAMETER_TYPE
 TYPEDEF: D3DXPARAMETER_TYPE* LPD3DXPARAMETER_TYPE
 
 STRUCT: D3DXCONSTANTTABLE_DESC
@@ -159,10 +158,9 @@ COM-INTERFACE: ID3DXTextureShader IUnknown {3E3D67F8-AA7A-405d-A857-BA01D4758426
     HRESULT SetMatrixTransposeArray ( D3DXHANDLE hConstant, D3DXMATRIX* pMatrix, UINT Count )
     HRESULT SetMatrixTransposePointerArray ( D3DXHANDLE hConstant, D3DXMATRIX** ppMatrix, UINT Count ) ;
 
-C-ENUM:
+C-ENUM: D3DXINCLUDE_TYPE
     D3DXINC_LOCAL
     D3DXINC_SYSTEM ;
-TYPEDEF: int D3DXINCLUDE_TYPE
 TYPEDEF: D3DXINCLUDE_TYPE* LPD3DXINCLUDE_TYPE
 
 C-TYPE: ID3DXInclude
diff --git a/basis/windows/directx/xaudio2/xaudio2.factor b/basis/windows/directx/xaudio2/xaudio2.factor
index 303eaf26b1..bbbf55b34f 100644
--- a/basis/windows/directx/xaudio2/xaudio2.factor
+++ b/basis/windows/directx/xaudio2/xaudio2.factor
@@ -133,12 +133,11 @@ STRUCT: XAUDIO2_EFFECT_CHAIN
     { EffectCount        UINT32                     }
     { pEffectDescriptors XAUDIO2_EFFECT_DESCRIPTOR* } ;
 
-C-ENUM:
+C-ENUM: XAUDIO2_FILTER_TYPE
     LowPassFilter
     BandPassFilter
     HighPassFilter
     NotchFilter ;
-TYPEDEF: int XAUDIO2_FILTER_TYPE
 
 STRUCT: XAUDIO2_FILTER_PARAMETERS
     { Type      XAUDIO2_FILTER_TYPE }
-- 
2.34.1