[MLton-commit] r4317
Matthew Fluet
MLton@mlton.org
Sat, 28 Jan 2006 09:00:20 -0800
Avoiding keyword and name clashes
----------------------------------------------------------------------
U mlton/branches/on-20050822-x86_64-branch/runtime/Posix/FileSys/FileSys-consts.c
U mlton/branches/on-20050822-x86_64-branch/runtime/Posix/Signal.c
U mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY-consts.c
----------------------------------------------------------------------
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Posix/FileSys/FileSys-consts.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Posix/FileSys/FileSys-consts.c 2006-01-28 16:59:30 UTC (rev 4316)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Posix/FileSys/FileSys-consts.c 2006-01-28 17:00:16 UTC (rev 4317)
@@ -36,7 +36,7 @@
const C_Int_t Posix_FileSys_PC_NAME_MAX = _PC_NAME_MAX;
const C_Int_t Posix_FileSys_PC_PATH_MAX = _PC_PATH_MAX;
const C_Int_t Posix_FileSys_PC_PIPE_BUF = _PC_PIPE_BUF;
-const C_Int_t Posix_FileSys_PC_2_SYMLINKS = _PC_2_SYMLINKS;
+// const C_Int_t Posix_FileSys_PC_2_SYMLINKS = _PC_2_SYMLINKS;
const C_Int_t Posix_FileSys_PC_ALLOC_SIZE_MIN = _PC_ALLOC_SIZE_MIN;
const C_Int_t Posix_FileSys_PC_REC_INCR_XFER_SIZE = _PC_REC_INCR_XFER_SIZE;
const C_Int_t Posix_FileSys_PC_REC_MAX_XFER_SIZE = _PC_REC_MAX_XFER_SIZE;
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Posix/Signal.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Posix/Signal.c 2006-01-28 16:59:30 UTC (rev 4316)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Posix/Signal.c 2006-01-28 17:00:16 UTC (rev 4317)
@@ -54,7 +54,7 @@
return res;
}
-C_Errno_t(C_Int_t) Posix_Signal_handle (C_Int_t signum) {
+C_Errno_t(C_Int_t) Posix_Signal_handlee (C_Int_t signum) {
static struct sigaction sa;
sigaddset (GC_getSignalsHandledAddr (&gcState), signum);
Modified: mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY-consts.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY-consts.c 2006-01-28 16:59:30 UTC (rev 4316)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/Posix/TTY-consts.c 2006-01-28 17:00:16 UTC (rev 4317)
@@ -14,69 +14,69 @@
const C_Int_t Posix_TTY_V_VSUSP = VSUSP;
const C_Int_t Posix_TTY_V_VTIME = VTIME;
-const C_TCFlag_t Posix_TTY_I_BRKINT = BRKINT;
-const C_TCFlag_t Posix_TTY_I_ICRNL = ICRNL;
-const C_TCFlag_t Posix_TTY_I_IGNBRK = IGNBRK;
-const C_TCFlag_t Posix_TTY_I_IGNCR = IGNCR;
-const C_TCFlag_t Posix_TTY_I_IGNPAR = IGNPAR;
-const C_TCFlag_t Posix_TTY_I_INLCR = INLCR;
-const C_TCFlag_t Posix_TTY_I_INPCK = INPCK;
-const C_TCFlag_t Posix_TTY_I_ISTRIP = ISTRIP;
-const C_TCFlag_t Posix_TTY_I_IXANY = IXANY;
-const C_TCFlag_t Posix_TTY_I_IXOFF = IXOFF;
-const C_TCFlag_t Posix_TTY_I_IXON = IXON;
-const C_TCFlag_t Posix_TTY_I_PARMRK = PARMRK;
+const C_TCFlag_t Posix_TTY_IFlags_BRKINT = BRKINT;
+const C_TCFlag_t Posix_TTY_IFlags_ICRNL = ICRNL;
+const C_TCFlag_t Posix_TTY_IFlags_IGNBRK = IGNBRK;
+const C_TCFlag_t Posix_TTY_IFlags_IGNCR = IGNCR;
+const C_TCFlag_t Posix_TTY_IFlags_IGNPAR = IGNPAR;
+const C_TCFlag_t Posix_TTY_IFlags_INLCR = INLCR;
+const C_TCFlag_t Posix_TTY_IFlags_INPCK = INPCK;
+const C_TCFlag_t Posix_TTY_IFlags_ISTRIP = ISTRIP;
+const C_TCFlag_t Posix_TTY_IFlags_IXANY = IXANY;
+const C_TCFlag_t Posix_TTY_IFlags_IXOFF = IXOFF;
+const C_TCFlag_t Posix_TTY_IFlags_IXON = IXON;
+const C_TCFlag_t Posix_TTY_IFlags_PARMRK = PARMRK;
-const C_TCFlag_t Posix_TTY_O_OPOST = OPOST;
-const C_TCFlag_t Posix_TTY_O_ONLCR = ONLCR;
-const C_TCFlag_t Posix_TTY_O_OCRNL = OCRNL;
-const C_TCFlag_t Posix_TTY_O_ONOCR = ONOCR;
-const C_TCFlag_t Posix_TTY_O_ONLRET = ONLRET;
-const C_TCFlag_t Posix_TTY_O_OFILL = OFILL;
-const C_TCFlag_t Posix_TTY_O_NLDLY = NLDLY;
-const C_TCFlag_t Posix_TTY_O_NL0 = NL0;
-const C_TCFlag_t Posix_TTY_O_NL1 = NL1;
-const C_TCFlag_t Posix_TTY_O_CRDLY = CRDLY;
-const C_TCFlag_t Posix_TTY_O_CR0 = CR0;
-const C_TCFlag_t Posix_TTY_O_CR1 = CR1;
-const C_TCFlag_t Posix_TTY_O_CR2 = CR2;
-const C_TCFlag_t Posix_TTY_O_CR3 = CR3;
-const C_TCFlag_t Posix_TTY_O_TABDLY = TABDLY;
-const C_TCFlag_t Posix_TTY_O_TAB0 = TAB0;
-const C_TCFlag_t Posix_TTY_O_TAB1 = TAB1;
-const C_TCFlag_t Posix_TTY_O_TAB2 = TAB2;
-const C_TCFlag_t Posix_TTY_O_TAB3 = TAB3;
-const C_TCFlag_t Posix_TTY_O_BSDLY = BSDLY;
-const C_TCFlag_t Posix_TTY_O_BS0 = BS0;
-const C_TCFlag_t Posix_TTY_O_BS1 = BS1;
-const C_TCFlag_t Posix_TTY_O_VTDLY = VTDLY;
-const C_TCFlag_t Posix_TTY_O_VT0 = VT0;
-const C_TCFlag_t Posix_TTY_O_VT1 = VT1;
-const C_TCFlag_t Posix_TTY_O_FFDLY = FFDLY;
-const C_TCFlag_t Posix_TTY_O_FF0 = FF0;
-const C_TCFlag_t Posix_TTY_O_FF1 = FF1;
+const C_TCFlag_t Posix_TTY_OFlags_OPOST = OPOST;
+const C_TCFlag_t Posix_TTY_OFlags_ONLCR = ONLCR;
+const C_TCFlag_t Posix_TTY_OFlags_OCRNL = OCRNL;
+const C_TCFlag_t Posix_TTY_OFlags_ONOCR = ONOCR;
+const C_TCFlag_t Posix_TTY_OFlags_ONLRET = ONLRET;
+const C_TCFlag_t Posix_TTY_OFlags_OFILL = OFILL;
+const C_TCFlag_t Posix_TTY_OFlags_NLDLY = NLDLY;
+const C_TCFlag_t Posix_TTY_OFlags_NL0 = NL0;
+const C_TCFlag_t Posix_TTY_OFlags_NL1 = NL1;
+const C_TCFlag_t Posix_TTY_OFlags_CRDLY = CRDLY;
+const C_TCFlag_t Posix_TTY_OFlags_CR0 = CR0;
+const C_TCFlag_t Posix_TTY_OFlags_CR1 = CR1;
+const C_TCFlag_t Posix_TTY_OFlags_CR2 = CR2;
+const C_TCFlag_t Posix_TTY_OFlags_CR3 = CR3;
+const C_TCFlag_t Posix_TTY_OFlags_TABDLY = TABDLY;
+const C_TCFlag_t Posix_TTY_OFlags_TAB0 = TAB0;
+const C_TCFlag_t Posix_TTY_OFlags_TAB1 = TAB1;
+const C_TCFlag_t Posix_TTY_OFlags_TAB2 = TAB2;
+const C_TCFlag_t Posix_TTY_OFlags_TAB3 = TAB3;
+const C_TCFlag_t Posix_TTY_OFlags_BSDLY = BSDLY;
+const C_TCFlag_t Posix_TTY_OFlags_BS0 = BS0;
+const C_TCFlag_t Posix_TTY_OFlags_BS1 = BS1;
+const C_TCFlag_t Posix_TTY_OFlags_VTDLY = VTDLY;
+const C_TCFlag_t Posix_TTY_OFlags_VT0 = VT0;
+const C_TCFlag_t Posix_TTY_OFlags_VT1 = VT1;
+const C_TCFlag_t Posix_TTY_OFlags_FFDLY = FFDLY;
+const C_TCFlag_t Posix_TTY_OFlags_FF0 = FF0;
+const C_TCFlag_t Posix_TTY_OFlags_FF1 = FF1;
-const C_TCFlag_t Posix_TTY_C_CSIZE = CSIZE;
-const C_TCFlag_t Posix_TTY_C_CS5 = CS5;
-const C_TCFlag_t Posix_TTY_C_CS6 = CS6;
-const C_TCFlag_t Posix_TTY_C_CS7 = CS7;
-const C_TCFlag_t Posix_TTY_C_CS8 = CS8;
-const C_TCFlag_t Posix_TTY_C_CSTOPB = CSTOPB;
-const C_TCFlag_t Posix_TTY_C_CREAD = CREAD;
-const C_TCFlag_t Posix_TTY_C_PARENB = PARENB;
-const C_TCFlag_t Posix_TTY_C_PARODD = PARODD;
-const C_TCFlag_t Posix_TTY_C_HUPCL = HUPCL;
-const C_TCFlag_t Posix_TTY_C_CLOCAL = CLOCAL;
+const C_TCFlag_t Posix_TTY_CFlags_CSIZE = CSIZE;
+const C_TCFlag_t Posix_TTY_CFlags_CS5 = CS5;
+const C_TCFlag_t Posix_TTY_CFlags_CS6 = CS6;
+const C_TCFlag_t Posix_TTY_CFlags_CS7 = CS7;
+const C_TCFlag_t Posix_TTY_CFlags_CS8 = CS8;
+const C_TCFlag_t Posix_TTY_CFlags_CSTOPB = CSTOPB;
+const C_TCFlag_t Posix_TTY_CFlags_CREAD = CREAD;
+const C_TCFlag_t Posix_TTY_CFlags_PARENB = PARENB;
+const C_TCFlag_t Posix_TTY_CFlags_PARODD = PARODD;
+const C_TCFlag_t Posix_TTY_CFlags_HUPCL = HUPCL;
+const C_TCFlag_t Posix_TTY_CFlags_CLOCAL = CLOCAL;
-const C_TCFlag_t Posix_TTY_L_ECHO = ECHO;
-const C_TCFlag_t Posix_TTY_L_ECHOE = ECHOE;
-const C_TCFlag_t Posix_TTY_L_ECHOK = ECHOK;
-const C_TCFlag_t Posix_TTY_L_ECHONL = ECHONL;
-const C_TCFlag_t Posix_TTY_L_ICANON = ICANON;
-const C_TCFlag_t Posix_TTY_L_IEXTEN = IEXTEN;
-const C_TCFlag_t Posix_TTY_L_ISIG = ISIG;
-const C_TCFlag_t Posix_TTY_L_NOFLSH = NOFLSH;
-const C_TCFlag_t Posix_TTY_L_TOSTOP = TOSTOP;
+const C_TCFlag_t Posix_TTY_LFlags_ECHO = ECHO;
+const C_TCFlag_t Posix_TTY_LFlags_ECHOE = ECHOE;
+const C_TCFlag_t Posix_TTY_LFlags_ECHOK = ECHOK;
+const C_TCFlag_t Posix_TTY_LFlags_ECHONL = ECHONL;
+const C_TCFlag_t Posix_TTY_LFlags_ICANON = ICANON;
+const C_TCFlag_t Posix_TTY_LFlags_IEXTEN = IEXTEN;
+const C_TCFlag_t Posix_TTY_LFlags_ISIG = ISIG;
+const C_TCFlag_t Posix_TTY_LFlags_NOFLSH = NOFLSH;
+const C_TCFlag_t Posix_TTY_LFlags_TOSTOP = TOSTOP;
const C_Speed_t Posix_TTY_B0 = B0;
const C_Speed_t Posix_TTY_B50 = B50;