From 46330e2fe3a4de22433d33ccaa9ff7fe7353dbaf Mon Sep 17 00:00:00 2001 From: Walter Bright Date: Fri, 28 Dec 2007 01:47:21 +0000 Subject: [PATCH] manifest => enum --- std/c/stdio.d | 32 ++++++++++++++++---------------- std/c/windows/windows.d | 14 +++++++------- std/string.d | 4 ++-- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/std/c/stdio.d b/std/c/stdio.d index ba0a62f5e..995fb467b 100644 --- a/std/c/stdio.d +++ b/std/c/stdio.d @@ -18,29 +18,29 @@ extern (C): version (Win32) { - manifest + enum { - int _NFILE = 60; /// - int BUFSIZ = 0x4000; /// - int EOF = -1; /// - int FOPEN_MAX = 20; /// - int FILENAME_MAX = 256; /// 255 plus NULL - int TMP_MAX = 32767; /// - int _SYS_OPEN = 20; /// - int SYS_OPEN = _SYS_OPEN; /// - wchar WEOF = 0xFFFF; /// + int _NFILE = 60, /// + int BUFSIZ = 0x4000, /// + int EOF = -1, /// + int FOPEN_MAX = 20, /// + int FILENAME_MAX = 256, /// 255 plus NULL + int TMP_MAX = 32767, /// + int _SYS_OPEN = 20, /// + int SYS_OPEN = _SYS_OPEN, /// + wchar WEOF = 0xFFFF, /// } } version (linux) { - manifest + enum { - int EOF = -1; - int FOPEN_MAX = 16; - int FILENAME_MAX = 4095; - int TMP_MAX = 238328; - int L_tmpnam = 20; + int EOF = -1, + int FOPEN_MAX = 16, + int FILENAME_MAX = 4095, + int TMP_MAX = 238328, + int L_tmpnam = 20, } } diff --git a/std/c/windows/windows.d b/std/c/windows/windows.d index 1accec980..e8eda1bfb 100644 --- a/std/c/windows/windows.d +++ b/std/c/windows/windows.d @@ -251,10 +251,10 @@ enum FILE_VOLUME_IS_COMPRESSED = 0x00008000, } -manifest +enum { - DWORD MAILSLOT_NO_MESSAGE = cast(DWORD)-1; - DWORD MAILSLOT_WAIT_FOREVER = cast(DWORD)-1; + DWORD MAILSLOT_NO_MESSAGE = cast(DWORD)-1, + DWORD MAILSLOT_WAIT_FOREVER = cast(DWORD)-1, } enum : uint @@ -278,11 +278,11 @@ enum TRUNCATE_EXISTING = 5, } -manifest +enum { - HANDLE INVALID_HANDLE_VALUE = cast(HANDLE)-1; - DWORD INVALID_SET_FILE_POINTER = cast(DWORD)-1; - DWORD INVALID_FILE_SIZE = cast(DWORD)0xFFFFFFFF; + HANDLE INVALID_HANDLE_VALUE = cast(HANDLE)-1, + DWORD INVALID_SET_FILE_POINTER = cast(DWORD)-1, + DWORD INVALID_FILE_SIZE = cast(DWORD)0xFFFFFFFF, } struct OVERLAPPED { diff --git a/std/string.d b/std/string.d index 6cc0054d2..e1560efd2 100644 --- a/std/string.d +++ b/std/string.d @@ -67,8 +67,8 @@ invariant char[52] letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz"; /// A..Za..z invariant char[6] whitespace = " \t\v\r\n\f"; /// ASCII whitespace -manifest dchar LS = '\u2028'; /// UTF line separator -manifest dchar PS = '\u2029'; /// UTF paragraph separator +enum dchar LS = '\u2028'; /// UTF line separator +enum dchar PS = '\u2029'; /// UTF paragraph separator /// Newline sequence for this system version (Windows)