zeroc-ice 3.6b1 → 3.6.0

data/ext/ice/mcpp/system.H

@@ -41,11 +41,7 @@
 
 #define SYSTEM_H
 
-#if     HAVE_CONFIG_H
 #include    "configed.H"
-#else
-#include    "noconfig.H"
-#endif
 
 /* Some system has a wrong definition of UCHAR_MAX.  See cpp-test.html#5.1.3 */
 #if     UCHARMAX < -255
@@ -168,28 +164,9 @@
 #define STD                 3           /* Standard moce        */
 #define POST_STD            9           /* Special mode of MCPP */
 
-/*
- * TRIGRAPHS_INIT   Initial value for the -3 option.  If TRUE -3
- *              disables trigraphs, if FALSE -3 enables them.
- * DIGRAPHS_INIT    Initial value for the -2 option.  If TRUE -2
- *              disables digraphs, if FALSE -2 enables them.
- * OK_UCN       Enable recognition of Universal-Character-Name sequence
- *              by -V199901L option.
- * OK_MBIDENT   Enable multi-byte characters in identifier by -V199901L
- *              option.
- * EXPAND_PRAGMA    Enable macro expansion of #pragma line (even in modes
- *              other than C99).
- * expr_t, uexpr_t      Type of maximum integer:
- *              long long (unsigned long long) or longer.
- * EXPR_MAX should be defined to the maximum value of uexpr_t.
- */
-#define TRIGRAPHS_INIT      FALSE
-#define DIGRAPHS_INIT       FALSE
 #ifndef EXPAND_PRAGMA
 #define EXPAND_PRAGMA       FALSE
 #endif
-#define OK_UCN              TRUE
-#define OK_MBIDENT          FALSE
 
 #if     HAVE_INTMAX_T
 #if     HAVE_STDINT_H

data/ext/ice/mcpp/system.c

@@ -36,12 +36,8 @@
  *      1. specify the constants in "configed.H" or "noconfig.H",
  *      2. append the system-dependent routines in this file.
  */
-#if PREPROCESSED
-#include    "mcpp.H"
-#else
 #include    "system.H"
 #include    "internal.H"
-#endif
 
 #if     HOST_SYS_FAMILY == SYS_UNIX
 #include    "unistd.h"              /* For getcwd(), readlink() */
@@ -110,24 +106,17 @@ static void     usage( int opt);
                 /* Putout usage of MCPP             */
 static void     set_opt_list( char * optlist);
                 /* Set list of legal option chars   */
-static int      parse_warn_level( const char * mcpp_optarg, int opt);
-                /* Parse warning level option       */
 static void     def_a_macro( int opt, char * def);
                 /* Do a -D option                   */
 static void     chk_opts( int sflag, int trad);
                 /* Check consistency of options     */
-#if COMPILER != GNUC
-static void     init_cpu_macro( int gval, int sse);
-                /* Predefine CPU-dependent macros   */
-#endif
 static void     init_predefines( void);
                 /* Set and unset predefined macros  */
 static void     init_std_defines( void);
                 /* Predefine Standard macros        */
 static void     set_limit( void);
                 /* Set minimum translation limits   */
-static void     set_pragma_op( void);
-                /* Set the _Pragma() operator       */
+
 static void     put_info( FILEINFO * sharp_file);
                 /* Print compiler-specific-inf      */
 static char *   set_files( int argc, char ** argv, char ** in_pp
@@ -149,15 +138,6 @@ static char *   norm_path( const char * dir, const char * fname, int inf
 static void     deref_syml( char * slbuf1, char * slbuf2, char * chk_start);
                 /* Dereference symbolic linked directory and file   */
 #endif
-#if COMPILER == GNUC
-static void     init_gcc_macro( void);
-                /* Predefine GCC-specific macros    */
-static void     chk_env( void);
-                /* Check the environment variables  */
-#elif   COMPILER == MSC
-static void     init_msc_macro( void);
-                /* Predefine Visual C-specific macros       */
-#endif
 static void     def_macros( void);
                 /* Define macros specified by -D    */
 static void     undef_macros( void);
@@ -179,22 +159,6 @@ static int      open_file( const char ** dirp, const char * src_dir
                 /* Open a source file       */
 static const char *     set_fname( const char * filename);
                 /* Remember the source filename     */
-#if SYSTEM == SYS_MAC
-#if COMPILER == GNUC
-static char *   search_header_map( const char * hmap_file
-        , const char * filename, char * pathlist);
-                /* Search header map file for a header  */
-static unsigned hmap_hash( const char * fname);
-                /* Get hash value for the fname     */
-#endif
-static void     init_framework( void);
-                /* Initialize framework[]           */
-static int      search_framework( char * filename);
-                /* Search "Framework" directories   */
-static int      search_subdir( char * fullname, char * cp, char * frame
-        , char * fname, int sys_frame);
-                /* Search "Headers" and other dirs  */
-#endif  /* SYSTEM == SYS_MAC    */
 #if 0   /* This function is only for debugging use  */
 static int      chk_dirp( const char ** dirp);
                 /* Check validity of dirp arg for open_file()   */
@@ -213,16 +177,12 @@ static int      included( const char * fullname);
                 /* The file has been once included? */
 static void     push_or_pop( int direction);
                 /* Push or pop a macro definition   */
-static int      do_prestd_directive( void);
-                /* Process pre-Standard directives  */
 static void     do_preprocessed( void);
                 /* Process preprocessed file        */
 static int      do_debug( int set);
                 /* #pragma MCPP debug, #debug       */
 static void     dump_path( void);
                 /* Print include search path        */
-static void     do_asm( int asm_start);
-                /* Process #asm, #endasm            */
 static int      mcpp_getopt( int argc, char * const * argv, const char * opts);
                 /* getopt() to prevent linking of glibc getopt  */
 
@@ -245,7 +205,7 @@ static const char **    incend;         /* -> active end of incdir  */
 static int          max_inc;            /* Number of incdir[]       */
 
 typedef struct inc_list {       /* List of directories or files     */
-    char *      name;           /* Filename or directory-name       */
+    char       *name;           /* Filename or directory-name       */
     size_t      len;                    /* Length of 'name'         */
 } INC_LIST;
 
@@ -303,58 +263,12 @@ static char *   mkdep_mt;               /* Argument of -MT option   */
 /* sharp_filename is filename for #line line, used only in cur_file()   */
 static char *   sharp_filename = NULL;
 static char *   argv0;      /* argv[ 0] for usage() and version()   */
-static int      ansi;           /* __STRICT_ANSI__ flag for GNUC    */ 
 static int      compat_mode;
                 /* "Compatible" mode of recursive macro expansion   */
-#define MAX_ARCH_LEN    16
-static char     arch[ MAX_ARCH_LEN];    /* -arch or -m64, -m32 options      */
-
-#if COMPILER == GNUC
-#define N_QUOTE_DIR     8
-/* quote_dir[]:     Include directories for "header" specified by -iquote   */
-/* quote_dir_end:   Active end of quote_dir */
-static const char *     quote_dir[ N_QUOTE_DIR];
-static const char **    quote_dir_end = quote_dir;
-/* sys_dirp indicates the first directory to search for system headers.     */
-static const char **    sys_dirp = NULL;        /* System header directory  */
-static const char *     sysroot = NULL; /* Logical root directory of header */
-static int      i_split = FALSE;                /* For -I- option   */
-static int      gcc_work_dir = FALSE;           /* For -fworking-directory  */
-static int      gcc_maj_ver;                    /* __GNUC__         */
-static int      gcc_min_ver;                    /* __GNUC_MINOR__   */
-static int      dDflag = FALSE;         /* Flag of -dD option       */
-static int      dMflag = FALSE;         /* Flag of -dM option       */
-#endif
-
-#if COMPILER == GNUC || COMPILER == MSC
-/*
- * preinclude points to the file specified by -include (-Fl for MSC) option,
- * which is included prior to the main input file.
- */
-#define         NPREINCLUDE 8
-static char *   preinclude[ NPREINCLUDE];       /* File to pre-include      */
-static char **  preinc_end = preinclude;    /* -> active end of preinclude  */
-#endif
-
-#if COMPILER == MSC
-static int      wchar_t_modified = FALSE;   /* -Zc:wchar_t flag     */
-#endif
-
-#if COMPILER == LCC
-static const char *     optim_name = "__LCCOPTIMLEVEL";
-#endif
 
 #if SYSTEM == SYS_CYGWIN
 static int      no_cygwin = FALSE;          /* -mno-cygwin          */
 
-#elif   SYSTEM == SYS_MAC
-#define         MAX_FRAMEWORK   8
-static char *   framework[ MAX_FRAMEWORK];  /* Framework directories*/
-static int      num_framework;          /* Current number of framework[]    */
-static int      sys_framework;          /* System framework dir     */
-static const char **    to_search_framework;
-                        /* Search framework[] next to the directory */
-static int      in_import;          /* #import rather than #include */
 #endif
 
 #define NO_DIR  FALSE
@@ -363,7 +277,6 @@ static int      in_import;          /* #import rather than #include */
 static int      no_dir;
 #endif
 
-#if MCPP_LIB
 void    init_system( void)
 /* Initialize static variables  */
 {
@@ -373,37 +286,20 @@ void    init_system( void)
     incend = incdir = NULL;
     fnamelist = once_list = NULL;
     search_rule = SEARCH_INIT;
-    mb_changed = nflag = ansi = compat_mode = FALSE;
+    mb_changed = nflag = compat_mode = FALSE;
     mkdep_fp = NULL;
     mkdep_target = mkdep_mf = mkdep_md = mkdep_mq = mkdep_mt = NULL;
     std_val = -1L;
     def_cnt = undef_cnt = 0;
     mcpp_optind = mcpp_opterr = 1;
-#if COMPILER == GNUC
-    sys_dirp = NULL;
-    sysroot = NULL;
-    gcc_work_dir = i_split = FALSE;
-    quote_dir_end = quote_dir;
-    dDflag = dMflag = FALSE;
-#endif
-#if COMPILER == MSC
-    wchar_t_modified = FALSE;
-#endif
-#if COMPILER == GNUC || COMPILER == MSC
-    preinc_end = preinclude;
-#endif
 #if SYSTEM == SYS_CYGWIN
     no_cygwin = FALSE;
-#elif   SYSTEM == SYS_MAC
-    num_framework = sys_framework = 0;
-    to_search_framework = NULL;
 #endif
 #if NO_DIR
     no_dir = FALSE;
 #endif
 }
 
-#endif
 
 #define OPTLISTLEN  80
 
@@ -418,34 +314,17 @@ void    do_options(
  */
 {
     char        optlist[ OPTLISTLEN];       /* List of option letter*/
-    const char *    warning = "warning: -%c%s option is ignored\n";
     int         opt;
     int         unset_sys_dirs;
         /* Unset system-specific and site-specific include directories ?    */
     int         set_cplus_dir;  /* Set C++ include directory ? (for GCC)*/
     int         show_path;          /* Show include directory list  */
-    DEFBUF *    defp;
-    VAL_SIGN *  valp;
     int         sflag;                      /* -S option or similar */
     int         trad;                       /* -traditional         */
-    int         old_mode;                   /* backup of 'mcpp_mode'*/
-    int         gval, sse;
-    char *      cp;
     int         i;
-#if COMPILER == GNUC
-#define NSYSDIR   8
-    /* System include directory specified by -isystem   */
-    char *      sysdir[ NSYSDIR] = { NULL, };
-    char **     sysdir_end = sysdir;
-    int         integrated_cpp; /* Flag of cc1 which integrates cpp in it   */
-#elif   COMPILER == LCC
-    const char *    debug_name = "__LCCDEBUGLEVEL";
-#endif
 
     argv0 = argv[ 0];
     nflag = unset_sys_dirs = show_path = sflag = trad = FALSE;
-    arch[ 0] = 0;
-    gval = sse = 0;
     set_cplus_dir = TRUE;
 
     /* Get current directory for -I option and #pragma once */
@@ -456,19 +335,6 @@ void    do_options(
     sprintf( cur_work_dir + strlen( cur_work_dir), "%c%c", PATH_DELIM, EOS);
         /* Append trailing path-delimiter   */
 
-#if COMPILER == GNUC
-    defp = look_id( "__GNUC__");    /* Already defined by init_defines()    */
-    gcc_maj_ver = atoi( defp->repl);
-    defp = look_id( "__GNUC_MINOR__");
-    gcc_min_ver = atoi( defp->repl);
-    integrated_cpp = ((gcc_maj_ver == 3 && gcc_min_ver >= 3)
-            || gcc_maj_ver == 4);
-#endif
-#if COMPILER == GNUC || COMPILER == MSC
-    option_flags.dollar_in_name = TRUE;
-    /* GCC and Visual C allows '$' in name by default   */
-#endif
-
     set_opt_list( optlist);
 
 opt_search: ;
@@ -477,151 +343,10 @@ opt_search: ;
 
         switch (opt) {          /* Command line option character    */
 
-#if COMPILER == GNUC
-        case '$':                       /* Forbid '$' in identifier */
-            option_flags.dollar_in_name = FALSE;
-            break;
-#endif
-
-        case '+':
-#if COMPILER == GNUC
-plus:
-#endif
-            if (cplus_val || sflag) {
-                mcpp_fputs( "warning: -+ option is ignored\n", ERR);
-                break;
-            }
-            cplus_val = CPLUS;
-            break;
-#if COMPILER == GNUC
-        case '-':
-            if (memcmp( mcpp_optarg, "sysroot", 7) == 0) {
-                if (mcpp_optarg[ 7] == '=')             /* --sysroot=DIR    */
-                    sysroot = mcpp_optarg + 8;
-                else if (mcpp_optarg[ 7] == EOS)        /* --sysroot DIR    */
-                    sysroot = argv[ mcpp_optind++];
-                else
-                    usage( opt);
-                break;
-            } else {
-                usage( opt);
-            }
-#endif
-        case '2':                   /* Reverse digraphs recognition */
-            option_flags.dig = ! option_flags.dig;
-            break;
-        case '3':                   /* Reverse trigraph recogniion  */
-            option_flags.trig = ! option_flags.trig;
-            break;
-
-        case '@':                   /* Special preprocessing mode   */
-            old_mode = mcpp_mode;
-            if (str_eq( mcpp_optarg, "post")
-                    || str_eq( mcpp_optarg, "poststd"))
-                mcpp_mode = POST_STD;   /* 'post-Standard' mode     */
-            else if (str_eq( mcpp_optarg, "old")
-                    || str_eq( mcpp_optarg, "oldprep"))
-                mcpp_mode = OLD_PREP;   /* 'old-Preprocessor' mode  */
-            else if (str_eq( mcpp_optarg, "kr"))
-                mcpp_mode = KR;         /* 'K&R 1st' mode           */
-            else if (str_eq( mcpp_optarg, "std"))
-                mcpp_mode = STD;        /* 'Standard' mode (default)*/
-            else if (str_eq( mcpp_optarg, "compat")) {
-                compat_mode = TRUE;     /* 'compatible' mode        */
-                mcpp_mode = STD;
-            }
-            else 
-                usage( opt);
-            standard = (mcpp_mode == STD || mcpp_mode == POST_STD);
-            if (old_mode != STD && old_mode != mcpp_mode)
-                mcpp_fprintf( ERR, "Mode is redefined to: %s\n", mcpp_optarg);
-            break;
-
-#if COMPILER == GNUC
-        case 'A':       /* Ignore -A system(gnu), -A cpu(vax) or so */
-            break;
-        case 'a':
-            if (str_eq( mcpp_optarg, "nsi")) {      /* -ansi                */
-                look_and_install( "__STRICT_ANSI__", DEF_NOARGS_PREDEF, null
-                        , "1");
-                ansi = TRUE;
-                break;
-            } else if (memcmp( mcpp_optarg, "uxbase", 6) == 0) {
-                mcpp_optind++;
-                break;  /* Ignore '-auxbase some' or such nonsence  */
-#if SYSTEM == SYS_MAC
-            } else if (str_eq( mcpp_optarg, "rch")) {   /* -arch    */
-                strcpy( arch, argv[ mcpp_optind++]);
-                if (str_eq( arch, "ppc") || str_eq( arch, "ppc7400")
-                        || str_eq( arch, "ppc64")
-                        || str_eq( arch, "i386") || str_eq( arch, "i686")
-                        || str_eq( arch, "x86_64") || str_eq( arch, "amd64")) {
-                    if (str_eq( arch, "i686"))
-                        strcpy( arch, "i386");
-                    else if (str_eq( arch, "amd64"))
-                        strcpy( arch, "x86_64");
-                    else if (str_eq( arch, "ppc7400"))
-                        strcpy( arch, "ppc");
-                    break;
-                }   /* Else usage() */
-#endif
-            }
-            usage( opt);
-#elif   COMPILER == MSC
-        case 'a':
-            if (memcmp( mcpp_optarg, "rch", 3) == 0) {
-                if (str_eq( mcpp_optarg + 3, ":SSE")        /* -arch:SSE    */
-                        || str_eq( mcpp_optarg + 3, ":sse"))
-                    sse = 1;
-                else if (str_eq( mcpp_optarg + 3, ":SSE2")  /* -arch:SSE2   */
-                        || str_eq( mcpp_optarg + 3, ":sse2"))
-                    sse = 2;
-                /* Else ignore  */
-            } else {
-                usage( opt);
-            }
-            break;
-
-        case 'A':
-            option_flags.lang_asm = TRUE;   /* "assembler" source   */
-            break;
-#else
-        case 'a':
-            option_flags.lang_asm = TRUE;   /* "assembler" source   */
-            break;
-#endif
-
-#if ! STD_LINE_PREFIX
-        case 'b':
-            std_line_prefix = TRUE; /* Putout line and file infor-  */
-            break;                  /*   mation in C source style.  */
-#endif
-
         case 'C':                           /* Keep comments        */
             option_flags.c = TRUE;
             break;
 
-#if COMPILER == GNUC
-        case 'c':
-            if (! integrated_cpp)
-                usage( opt);
-            break;                  /* Else ignore this option      */
-        case 'd':
-            if (str_eq( mcpp_optarg, "M")) {                /* -dM          */
-                dMflag = TRUE;
-                no_output++;
-            } else if (str_eq( mcpp_optarg, "D")) {         /* -dD          */
-                dDflag = TRUE;
-            } else if (str_eq( mcpp_optarg, "igraphs")) {   /* -digraphs    */
-                option_flags.dig = TRUE;
-            } else if (str_eq( mcpp_optarg, "umpbase")) {   /* -dumpbase    */
-                ;                                           /* Ignore       */
-            } else {
-                usage( opt);
-            }
-            break;
-#endif  /* COMPILER == GNUC */
-
         case 'D':                           /* Define symbol        */
             if (def_cnt >= MAX_DEF) {
                 mcpp_fputs( "Too many -D options.\n", ERR);
@@ -631,126 +356,13 @@ plus:
             break;
 
         case 'e':
-            /* Change the default MBCHAR encoding   */
-            if (set_encoding( mcpp_optarg, FALSE, 0) == NULL)
-                usage( opt);
-            mb_changed = TRUE;
+            // We support this option, but it does nothing.
             break;
 
-#if COMPILER == GNUC
-        case 'E':
-            if (! integrated_cpp)
-                usage( opt);
-            break;                          /* Ignore this option   */
-        case 'f':
-            if (memcmp( mcpp_optarg, "input-charset=", 14) == 0) {
-                /* Treat -finput-charset= as the same option as -e  */
-                if (set_encoding( mcpp_optarg + 14, FALSE, 0) == NULL)
-                    usage( opt);
-                mb_changed = TRUE;
-            } else if (str_eq( mcpp_optarg, "working-directory")) {
-                gcc_work_dir = TRUE;
-            } else if (str_eq( mcpp_optarg, "no-working-directory")) {
-                gcc_work_dir = FALSE;
-            } else if (str_eq( mcpp_optarg, "stack-protector")) {
-                look_and_install( "__SSP__", DEF_NOARGS_PREDEF, null, "1");
-            } else if (str_eq( mcpp_optarg, "stack-protector-all")) {
-                look_and_install( "__SSP_ALL__", DEF_NOARGS_PREDEF, null, "2");
-            } else if (str_eq( mcpp_optarg, "exceptions")) {
-                look_and_install( "__EXCEPTIONS", DEF_NOARGS_PREDEF, null
-                        , "1");
-            } else if (str_eq( mcpp_optarg, "no-exceptions")) {
-                undef_list[ undef_cnt++] = "__EXCEPTIONS";
-            } else if (str_eq( mcpp_optarg, "PIC")
-                    || str_eq( mcpp_optarg, "pic")
-                    || str_eq( mcpp_optarg, "PIE")
-                    || str_eq( mcpp_optarg, "pie")) {
-                look_and_install( "__PIC__", DEF_NOARGS_PREDEF, null, "1");
-                look_and_install( "__pic__", DEF_NOARGS_PREDEF, null, "1");
-            } else if (str_eq( mcpp_optarg, "no-dollars-in-identifiers")) {
-                option_flags.dollar_in_name = FALSE;
-            } else if (str_eq( mcpp_optarg, "no-show-column")) {
-                ;                           /* Ignore this option   */
-            } else if (! integrated_cpp) {
-                usage( opt);
-            }
-            break;
-
-        case 'g':
-            if (!isdigit( *mcpp_optarg)
-                    && str_eq( argv[ mcpp_optind - 2], "-g"))
-                /* Neither '-g 0' nor '-ggdb' -- No argument    */
-                mcpp_optind--;
-            break;                          /* Ignore the option    */
-#elif COMPILER == LCC
-        case 'g':               /* Define __LCCDEBUGLEVEL as <n>    */
-            if (*(mcpp_optarg + 1) == EOS && isdigit( *mcpp_optarg)) {
-                defp = look_id( debug_name);
-                strcpy( defp->repl, mcpp_optarg);
-            } else {
-                usage( opt);
-            }
-            break;
-#elif COMPILER == MSC
-        case 'G':
-            if (*(mcpp_optarg + 1) == EOS) {    /* -Gx              */
-                switch (*mcpp_optarg) {
-                case '3':   case '4':   case '5':   case '6':
-                    gval = *mcpp_optarg;
-                    break;
-                case 'B':                   /* -GB                  */
-                    gval = '6';
-                    break;
-                case 'R':
-                    look_and_install( "_CPPRTTI", DEF_NOARGS_PREDEF, null
-                            , "1");
-                    break;
-                case 'X':
-                    look_and_install( "_CPPUNWIND", DEF_NOARGS_PREDEF, null
-                            , "1");
-                    break;
-                case 'Z':
-                    look_and_install( "__MSVC_RUNTIME_CHECKS"
-                            , DEF_NOARGS_PREDEF, null, "1");
-                    break;
-                default :
-                    mcpp_fprintf( ERR, warning, opt, mcpp_optarg);
-                }
-            } else {
-                usage( opt);
-            }
-            break;
-#endif
-
-#if SYSTEM == SYS_MAC
-        case 'F':
-            framework[ num_framework++] = mcpp_optarg;
-            break;
-#endif
-
-        case 'h':
-            if (*(mcpp_optarg + 1) == EOS && isdigit( *mcpp_optarg))
-                /* a digit  */
-                look_and_install( "__STDC_HOSTED__", DEF_NOARGS_PREDEF, null
-                        , mcpp_optarg);
-            else
-                usage( opt);
-            break;
-
-#if COMPILER == MSC
-        case 'X':
-                unset_sys_dirs = TRUE;
-                break;
-#endif
         case 'I':                           /* Include directory    */
             if (str_eq( mcpp_optarg, "-")) {        /* -I-                  */
-#if COMPILER == GNUC
-                sys_dirp = incend;  /* Split include directories    */
-                i_split = TRUE;
-#else
                 unset_sys_dirs = TRUE;
                         /* Unset pre-specified include directories  */
-#endif
             } else if (*(mcpp_optarg + 1) == EOS && isdigit( *mcpp_optarg)
                     && (i = *mcpp_optarg - '0') != 0
                     && (i & ~(CURRENT | SOURCE)) == 0) {
@@ -760,390 +372,17 @@ plus:
             }
             break;
 
-#if COMPILER == MSC
-        case 'F':
-            if (str_eq( mcpp_optarg, "l")) {        /* -Fl          */
-                if (preinc_end >= &preinclude[ NPREINCLUDE]) {
-                    mcpp_fputs( "Too many -Fl options.\n", ERR);
-                    longjmp( error_exit, -1);
-                }
-                *preinc_end++ = argv[ mcpp_optind++];
-            } else {
-                usage( opt);
-            }
-            break;
-#endif
-
-#if COMPILER == GNUC
-        case 'i':
-            if (str_eq( mcpp_optarg, "nclude")) {   /* -include     */
-                if (preinc_end >= &preinclude[ NPREINCLUDE]) {
-                    mcpp_fputs( "Too many -include options.\n", ERR);
-                    longjmp( error_exit, -1);
-                }
-                *preinc_end++ = argv[ mcpp_optind++];
-            } else if (str_eq( mcpp_optarg, "system")) {    /* -isystem     */
-                if (sysdir_end >= &sysdir[ NSYSDIR]) {
-                    mcpp_fputs( "Too many -isystem options.\n", ERR);
-                    longjmp( error_exit, -1);
-                }
-                *sysdir_end++ = argv[ mcpp_optind++];
-                /* Add the directory before system include directory*/
-            } else if (str_eq( mcpp_optarg, "quote")) {     /* -iquote      */
-                if (quote_dir_end >= &quote_dir[ N_QUOTE_DIR]) {
-                    mcpp_fputs( "Too many -iquote options.\n", ERR);
-                    longjmp( error_exit, -1);
-                }
-                *quote_dir_end++ = argv[ mcpp_optind++];
-                /* Add the directory for #include "header"          */
-            } else if (memcmp( mcpp_optarg, "sysroot", 7) == 0) {
-                if (mcpp_optarg[ 7] == '=')     /* -isysroot=DIR    */
-                    sysroot = mcpp_optarg + 8;
-                else if (mcpp_optarg[ 7] == EOS)        /* -isysroot DIR    */
-                    sysroot = argv[ mcpp_optind++];
-                else
-                    usage( opt);
-            } else if (str_eq( mcpp_optarg, "prefix")       /* -iprefix     */
-                    || str_eq( mcpp_optarg, "withprefix")   /* -iwithprefix */
-                    || str_eq( mcpp_optarg, "withprefixbefore")
-                                            /* -iwithprefixbefore   */
-                    || str_eq( mcpp_optarg, "dirafter")     /* -idirafter   */
-                    || str_eq( mcpp_optarg, "multilib")) {  /* -imultilib   */
-                mcpp_optind++;              /* Skip the argument    */
-                /* Ignore these options */
-            } else {
-                usage( opt);
-            }
-            break;
-#endif
-
-        case 'j':
-            option_flags.no_source_line = TRUE;
-            break;  /* Do not output the source line in diagnostics */
-
-#if COMPILER == MSC
-        case 'J':
-            look_and_install( "_CHAR_UNSIGNED", DEF_NOARGS_PREDEF, null, "1");
-            break;
-#endif
-
-        case 'K':
-            mcpp_debug |= MACRO_CALL;
-            /*
-             * Putout macro expansion informations embedded in comments.
-             * Same with '#pragma MCPP debug macro_call'.
-             */
-            /* Enable white spaces preservation, too    */
-            /* Fall through */
-        case 'k':
-            option_flags.k = TRUE;
-            /* Keep white spaces of input lines as they are */ 
-            break;
-
-#if COMPILER == GNUC
-        case 'l':
-            if (memcmp( mcpp_optarg, "ang-", 4) != 0) {
-                usage( opt);
-            } else if (str_eq( mcpp_optarg + 4, "c")) {     /* -lang-c  */
-                ;                           /* Ignore this option   */
-            } else if (str_eq( mcpp_optarg + 4, "c99")      /* -lang-c99*/
-                        || str_eq( mcpp_optarg + 4, "c9x")) {   /* -lang-c9x*/
-                if (! sflag) {
-                    stdc_val = 1;           /* Define __STDC__ to 1 */
-                    std_val = 199901L;
-                    sflag = TRUE;
-                }
-            } else if (str_eq( mcpp_optarg + 4, "c89")) {   /* -lang-c89*/
-                if (! sflag) {
-                    stdc_val = 1;           /* Define __STDC__ to 1 */
-                    sflag = TRUE;
-                }
-            } else if (str_eq( mcpp_optarg + 4, "c++")) {   /* -lang-c++*/
-                goto  plus;
-            } else if (str_eq( mcpp_optarg + 4, "asm")) {   /* -lang-asm*/
-                option_flags.lang_asm = TRUE;
-            } else {
-                usage( opt);
-            }
-            break;
-#endif  /* COMPILER == GNUC */
 
         case 'M':           /* Output source file dependency line   */
-            if (str_eq( mcpp_optarg, "M")) {                /* -MM  */
-                ;
-            } else if (str_eq( mcpp_optarg, "D")) {         /* -MD  */
-                mkdep |= (MD_SYSHEADER | MD_FILE);
-            } else if (str_eq( mcpp_optarg, "MD")) {         /* -MMD */
-                mkdep |= MD_FILE;
-            } else if (str_eq( mcpp_optarg, "P")) {          /* -MP  */
-                mkdep |= MD_PHONY;
-            } else if (str_eq( mcpp_optarg, "Q")) {  /* -MQ target   */
-                mkdep |= MD_QUOTE;
-                mkdep_mq = argv[ mcpp_optind++];
-            } else if (str_eq( mcpp_optarg, "T")) {  /* -MT target   */
-                mkdep_mt = argv[ mcpp_optind++];
-            } else if (str_eq( mcpp_optarg, "F")) {  /* -MF file     */
-                mkdep_mf = argv[ mcpp_optind++];
-            } else if (argv[ mcpp_optind - 1] == mcpp_optarg) {     /* -M   */
+            if (argv[ mcpp_optind - 1] == mcpp_optarg) {     /* -M   */
                 mkdep |= MD_SYSHEADER;
                 mcpp_optind--;
             } else {
                 usage( opt);
             }
-            if (str_eq( mcpp_optarg, "D") || str_eq( mcpp_optarg, "MD")) {
-                cp = argv[ mcpp_optind];
-                if (cp && *cp != '-')           /* -MD (-MMD) file  */
-                    mkdep_md = argv[ mcpp_optind++];
-            }
             mkdep |= MD_MKDEP;
             break;
 
-#if SYS_FAMILY == SYS_UNIX
-        case 'm':
-            if (str_eq( mcpp_optarg, "64")) {               /* -m64 */
-                if (str_eq( CPU, "i386"))
-                    strcpy( arch, "x86_64");
-                else if (str_eq( CPU, "ppc"))
-                    strcpy( arch, "ppc64");
-                /* Else ignore  */
-                break;
-            } else if (str_eq( mcpp_optarg, "32")) {        /* -m32 */
-                if (str_eq( CPU, "x86_64"))
-                    strcpy( arch, "i386");
-                else if (str_eq( CPU, "ppc64"))
-                    strcpy( arch, "ppc");
-                /* Else ignore  */
-                break;
-            } else if (str_eq( mcpp_optarg, "mmx")) {   /* -mmmx    */
-                look_and_install( "__MMX__", DEF_NOARGS_PREDEF, null, "1");
-                break;
-            } else if (str_eq( mcpp_optarg, "no-mmx")) {    /* -mno-mmx     */
-                undef_list[ undef_cnt++] = "__MMX__";
-                break;
-            }
-#endif  /* SYS_FAMILY == UNIX   */
-#if COMPILER == GNUC
-#if SYSTEM == SYS_CYGWIN
-            if (str_eq( mcpp_optarg, "no-cygwin")) {    /* -mno-cygwin      */
-                no_cygwin = TRUE;
-                break;
-            }
-#endif
-            if (! integrated_cpp)
-                usage( opt);
-            break;
-
-        case 'u':
-            if (! str_eq( mcpp_optarg, "ndef"))     /* -undef       */
-                usage( opt);                /* Else fall through    */
-#endif  /* COMPILER == GNUC */
-
-#if COMPILER == MSC
-        case 'u':
-#endif
-        case 'N':
-            /* No predefines:   remove "unix", "__unix__" and friends.  */
-            nflag = TRUE;
-            break;
-
-#if COMPILER == GNUC || NO_DIR
-        case 'n':
-#if NO_DIR
-            if (str_eq( mcpp_optarg, "odir")) {     /* -nodir       */
-                no_dir = TRUE;
-            }
-#endif
-#if COMPILER == GNUC
-            if (str_eq( mcpp_optarg, "ostdinc")) {  /* -nostdinc    */
-                unset_sys_dirs = TRUE;  /* Unset pre-specified directories  */
-            } else if (str_eq( mcpp_optarg, "ostdinc++")) { /* -nostdinc++  */
-                set_cplus_dir = FALSE;  /* Unset C++-specific directories   */
-            } else if (str_eq( mcpp_optarg, "oprecomp")) {  /* -noprecomp   */
-                mcpp_fprintf( ERR, warning, opt, mcpp_optarg);
-                break;
-            }
-#endif
-            else {
-                usage( opt);
-            }
-            break;
-#endif
-
-#if COMPILER == GNUC
-        case 'O':
-            if (integrated_cpp) {
-                if (*mcpp_optarg == '-')            /* No argument  */
-                    mcpp_optind--;
-                else if ((isdigit( *mcpp_optarg) && *mcpp_optarg != '0')
-                        || *mcpp_optarg == 's' || *mcpp_optarg == 'z')
-                                            /* -O1, -O2 -Os, -Oz    */
-                    look_and_install( "__OPTIMIZE__", DEF_NOARGS_PREDEF, null
-                            , "1");
-                else if (! isdigit( *mcpp_optarg))
-                    usage( opt);
-                /* Else -O0: ignore */
-            } else {
-                usage( opt);
-            }
-            break;                  /* Else ignore -Ox option       */
-#elif COMPILER == LCC
-        case 'O':                   /* Define __LCCOPTIMLEVEL as 1  */
-            defp = look_id( optim_name);
-            strcpy( defp->repl, "1");
-            break;
-#endif
-
-        case 'o':
-            *out_pp = mcpp_optarg;          /* Output file name     */
-            break;
-
-        case 'P':                           /* No #line output      */
-            option_flags.p = TRUE;
-            break;
-
-#if COMPILER == GNUC
-        case 'p':
-            if (str_eq( mcpp_optarg, "edantic")     /* -pedantic    */
-                    || str_eq( mcpp_optarg, "edantic-errors")) {
-                                            /* -pedantic-errors     */
-                /* This option does not imply -ansi */
-                if (warn_level == -1)
-                    warn_level = 0;
-                warn_level |= (1 | 2 | 4);
-                if (! sflag && ! cplus_val) {
-                    stdc_val = 1;
-                    sflag = TRUE;
-                }
-            } else {
-                usage( opt);
-            }
-            break;
-        case 'q':
-            if (str_eq( mcpp_optarg, "uiet"))
-                /* -quiet: GCC's undocumented, yet frequently specified opt */
-                break;                      /* Ignore the option    */
-            else
-                usage( opt);
-            break;
-#endif  /* COMPILER == GNUC */
-
-        case 'Q':
-            option_flags.q = TRUE;
-            break;
-
-#if COMPILER == MSC
-        case 'R':               /* -RTC1, -RTCc, -RTCs, -RTCu, etc. */
-            if (memcmp( mcpp_optarg, "TC", 2) == 0
-                    && *(mcpp_optarg + 2) != EOS)
-                look_and_install( "__MSVC_RUNTIME_CHECKS", DEF_NOARGS_PREDEF
-                        , null, "1");
-            else
-                usage( opt);
-            break;
-#endif
-
-        case 'S':
-            if (cplus_val || sflag) {   /* C++ or the second time   */
-                mcpp_fprintf( ERR, warning, opt, mcpp_optarg);
-                break;
-            }
-            i = *mcpp_optarg;
-            if (! isdigit( i) || *(mcpp_optarg + 1) != EOS)
-                usage( opt);
-            stdc_val = i - '0';
-            sflag = TRUE;
-            break;
-
-#if COMPILER == GNUC
-        case 'r':
-            if (str_eq( mcpp_optarg, "emap"))
-                mcpp_fprintf( ERR, warning, opt, mcpp_optarg);
-                                            /* Ignore -remap option */
-            else
-                usage( opt);
-            break;
-
-        case 's':
-            if (memcmp( mcpp_optarg, "td=", 3) == 0
-                    && strlen( mcpp_optarg) > 3) {  /* -std=STANDARD*/
-                cp = mcpp_optarg + 3;
-                if (str_eq( cp, "c89")              /* std=c89      */
-                        || str_eq( cp, "c90")       /* std=c90      */
-                        || str_eq( cp, "gnu89")     /* std=gnu89    */
-                        || str_eq( cp, "iso9899:1990")) {
-                    std_val = 0L;               /* C90 + extensions */
-                } else if (str_eq( cp, "c99")       /* std=c99      */
-                        || str_eq( cp, "c9x")       /* std=c9x      */
-                        || str_eq( cp, "gnu99")     /* std=gnu99    */
-                        || str_eq( cp, "gnu9x")     /* std=gnu9x    */
-                        || str_eq( cp, "iso9899:1999")
-                        || str_eq( cp, "iso9899:199x")) {
-                    std_val = 199901L;
-                } else if (str_eq( cp, "c++98")) {  /* std=c++98    */
-                    cplus_val = std_val = 199711L;
-                } else if (memcmp( cp, "iso9899:", 8) == 0
-                        && strlen( cp) >= 14) { /* std=iso9899:199409, etc. */
-                    mcpp_optarg = cp + 8;
-                    look_and_install( "__STRICT_ANSI__", DEF_NOARGS_PREDEF
-                            , null, "1");
-                    ansi = TRUE;
-                    goto Version;
-                } else if (memcmp( cp, "iso14882", 8) == 0) {
-                    cp += 8;
-                    ansi = TRUE;
-                    if (cp && *cp == ':' && strlen( cp) >= 7) {
-                                    /* std=iso14882:199711, etc.    */
-                        cplus_val = CPLUS;
-                        mcpp_optarg = cp + 1;
-                        goto Version;
-                    } else {
-                        goto plus;
-                    }
-                } else {
-                    usage( opt);
-                }
-                if (! cplus_val && memcmp( cp, "gnu", 3) != 0) {
-                    /* 'std=gnu*' does not imply -ansi  */
-                    look_and_install( "__STRICT_ANSI__", DEF_NOARGS_PREDEF
-                            , null, "1");
-                    ansi = TRUE;
-                }
-                stdc_val = 1;
-                sflag = TRUE;
-            } else {
-                usage( opt);
-            }
-            break;
-
-        case 't':
-            if (str_eq( mcpp_optarg, "raditional")
-                    || str_eq( mcpp_optarg, "raditional-cpp")) {
-                                /* -traditional, -traditional-cpp   */
-                trad = TRUE;
-                mcpp_mode = OLD_PREP;
-            } else if (str_eq( mcpp_optarg, "rigraphs")) {
-                option_flags.trig = TRUE;           /* -trigraphs   */
-            } else {
-                usage( opt);
-            }
-            break;
-#endif  /* COMPILER == GNUC */
-
-#if COMPILER == MSC
-        case 'T':
-            if (strlen( mcpp_optarg) > 1)
-                usage( opt);
-            i = tolower( *mcpp_optarg);             /* Fold case    */
-            if (i == 'c') {
-                ;                           /* Ignore this option   */
-            } else if (i == 'p') {
-                cplus_val = CPLUS;
-            } else {
-                usage( opt);
-            }
-            break;
-#endif
-
         case 'U':                           /* Undefine macro       */
             if (undef_cnt >= MAX_UNDEF) {
                 mcpp_fputs( "Too many -U options.\n", ERR);
@@ -1152,116 +391,6 @@ plus:
             undef_list[ undef_cnt++] = mcpp_optarg;
             break;
 
-        case 'V':
-#if COMPILER == GNUC
-Version:
-#endif
-            valp = eval_num( mcpp_optarg);
-            if (valp->sign == VAL_ERROR)
-                usage( opt);
-            std_val = (long) valp->val;
-            break;
-
-        case 'v':
-            option_flags.v = TRUE;
-            show_path = TRUE;
-            break;
-
-        case 'W':                           /* warning level        */
-            if (warn_level == -1)           /* Have to initialize   */
-                warn_level = 0;
-#if COMPILER == GNUC
-            if (argv[ mcpp_optind - 1] == mcpp_optarg) {    /* No argument  */
-                /*
-                 * Note: -W without argument is not officially supported.
-                 *  It may cause an error.
-                 */
-                warn_level |= (1 | 2 | 4 | 16);
-                mcpp_optind--;
-            } else if (str_eq( mcpp_optarg, "comment")
-                        || str_eq( mcpp_optarg, "comments")
-                        || str_eq( mcpp_optarg, "sign-compare")) {
-                warn_level |= 1;
-            } else if (str_eq( mcpp_optarg, "undef")) {
-                warn_level |= 4;
-            } else if (str_eq( mcpp_optarg, "all")) {
-                warn_level |= (1 | 16);     /* Convert -Wall to -W17*/
-            } else if (str_eq( mcpp_optarg, "trigraphs")) {
-                warn_level |= 16;
-            }
-#endif  /* COMPILER == GNUC */
-#if COMPILER == MSC
-            if (str_eq( mcpp_optarg, "all")) {
-                warn_level |= (1 | 16);     /* Convert -Wall to -W17*/
-            } else if (str_eq( mcpp_optarg, "L")) {
-                option_flags.no_source_line = TRUE;
-                                        /* Single-line diagnostic   */
-            }
-#endif
-            if (isdigit( *mcpp_optarg)) {
-                warn_level |= parse_warn_level( mcpp_optarg, opt);
-                if (warn_level > 31 || warn_level < 0)
-                    usage( opt);
-            }
-            if (warn_level == 0)
-                warn_level = 0xFF;          /* Remember this option */
-            /* Else ignore the option   */
-            break;
-
-#if COMPILER == GNUC || COMPILER == MSC
-        case 'w':                           /* Same as -W0          */
-            warn_level = 0xFF;              /* Remenber this option */
-            break;
-#endif
-
-#if COMPILER == GNUC
-        case 'x':
-            if (str_eq( mcpp_optarg, "c")) {
-                break;                      /* -x c -- ignore this  */
-            } else if (str_eq( mcpp_optarg, "c++")) {
-                goto plus;
-            } else if (str_eq( mcpp_optarg, "assembler-with-cpp")) {
-                option_flags.lang_asm = TRUE;
-                break;
-            } else {
-                usage( opt);
-            }
-            break;
-#endif
-
-#if COMPILER == MSC
-        case 'Z':
-            if (str_eq( mcpp_optarg, "c:wchar_t")) {        /* -Zc:wchar_t  */
-                look_and_install( "_NATIVE_WCHAR_T_DEFINED", DEF_NOARGS_PREDEF
-                        , null, "1");
-                look_and_install( "_WCHAR_T_DEFINED", DEF_NOARGS_PREDEF, null
-                        , "1");
-                wchar_t_modified = TRUE;
-            } else if (str_eq( mcpp_optarg, "c:wchar_t-")) {/* -Zc:wchar_t- */
-                wchar_t_modified = TRUE;        /* Do not define the macros */
-            } else if (str_eq( mcpp_optarg, "l")) {
-                look_and_install( "_VC_NODEFAULTLIB", DEF_NOARGS_PREDEF, null
-                        , "1");
-            } else if (str_eq( mcpp_optarg, "a")) {         /* -Za  */
-                undefine( "_MSC_EXTENSIONS");
-                option_flags.dollar_in_name = FALSE;
-            } else if (str_eq( mcpp_optarg, "e")) {
-                /* Ignore -Ze silently  */
-                break;
-            } else if (*(mcpp_optarg + 1) == EOS) {
-                /* -Z followed by one char  */
-                mcpp_fprintf( ERR, warning, opt, mcpp_optarg);
-                /* Ignore the option with warning   */
-            } else {
-                usage( opt);
-            }
-            break;
-#endif
-
-        case 'z':
-            option_flags.z = TRUE;  /* No output of included file   */
-            break;
-
         default:                            /* What is this one?    */
             usage( opt);
             break;
@@ -1280,52 +409,6 @@ Version:
     else if (warn_level == 0xFF)
         warn_level = 0;                 /* -W0 has high precedence  */
 
-#if SYSTEM == SYS_MAC
-    set_a_dir( NULL);                       /* Initialize incdir[]  */
-    to_search_framework = incend;
-                        /* Search framework[] next to the directory */
-#endif
-
-#if COMPILER == GNUC && SYSTEM == SYS_MAC
-    if (arch[ 0]) {             /* -arch option has been specified  */
-        if (((str_eq( CPU, "i386") || str_eq( CPU, "x86_64"))
-                && (! str_eq( arch, "i386") && ! str_eq( arch, "x86_64")))
-            || ((str_eq( CPU, "ppc") || str_eq( CPU, "ppc64"))
-                && (! str_eq( arch, "ppc") && ! str_eq( arch, "ppc64")))) {
-            mcpp_fprintf( ERR, "Wrong argument of -arch option: %s\n", arch);
-            longjmp( error_exit, -1);
-        }
-    }
-#endif
-    if (! arch[ 0]) {
-        /* None of -arch, -m32 or -m64 options has been specified.  */
-        /* The CPU-specific-macros will be defined in init_cpu_macro(). */
-        strcpy( arch, CPU);
-    }
-#if COMPILER != GNUC
-    init_cpu_macro( gval, sse);
-#endif
-
-#if COMPILER == GNUC
-    if (sysdir < sysdir_end) {
-        char **     dp = sysdir;
-        if (! sys_dirp || sys_dirp == incdir)
-            sys_dirp = dp;
-        while (dp < sysdir_end)
-            set_a_dir( *dp++);
-    }
-    if (*in_pp && str_eq( (*in_pp) + strlen( *in_pp) - 2, ".S"))
-        option_flags.lang_asm = TRUE;   /* Input file name is *.S   */
-    if (option_flags.lang_asm) {
-        look_and_install( "__ASSEMBLER__", DEF_NOARGS_PREDEF, null, "1");
-        option_flags.dollar_in_name = FALSE;        /* Disable '$' in name  */
-    }
-    if (! sys_dirp || sys_dirp == incdir)
-        sys_dirp = incend;
-#endif
-#if SYSTEM == SYS_MAC
-    init_framework();                   /* After setting sys_dirp   */
-#endif
     set_env_dirs();
     if (! unset_sys_dirs)
         set_sys_dirs( set_cplus_dir);
@@ -1348,9 +431,6 @@ Version:
             /* Else mcpp_main() will diagnose *in_pp and exit   */
     }
     if (! (mcpp_debug & MACRO_CALL)) {
-        /* -K option alters behavior of -v option   */
-        if (option_flags.v)
-            version();
         if (show_path) {
             fp_debug = stderr;
             dump_path();
@@ -1365,37 +445,12 @@ static void version( void)
  */
 {
     const char *    mes[] = {
-
-#if     MCPP_LIB
 /* Write messages here, for example, "MySomeTool with ".    */
-#endif
-
-#ifdef  VERSION_MSG
-        "MCPP V.2.7.2 (2008/11) "
-#else
-        "MCPP V.", VERSION, " (", DATE, ") "
-#endif
-#if     COMPILER == INDEPENDENT
-            , "compiler-independent-build "
-#else
-#ifdef  CMP_NAME
-            , "for ", CMP_NAME, " "
-#endif
-#endif
-            , "compiled by "
-#ifdef  VERSION_MSG
-            , VERSION_MSG
-#else
-#ifdef  HOST_CMP_NAME
-            , HOST_CMP_NAME
-#if     HOST_COMPILER == GNUC
-            , " V.", GCC_MAJOR_VERSION, ".", GCC_MINOR_VERSION
-#endif
-#endif
-#endif
-            , "\n",
-            NULL
-        };
+        "MCPP V.2.7.2 (2008/11)"
+        , "https://github.com/zeroc-ice/mcpp"
+        , "compiler-independent-build "
+        , NULL
+    };
 
     const char **   mpp = mes;
     while (*mpp)
@@ -1412,28 +467,11 @@ static void usage(
     const char *     mes[] = {
 
 "Usage:  ",
-"mcpp",
-" [-<opts> [-<opts>]] [<infile> [-<opts>] [<outfile>] [-<opts>]]\n",
-"    <infile> defaults to stdin and <outfile> defaults to stdout.\n",
-
-"\nCommonly used options:\n",
-
-"-@MODE      Specify preprocessing mode. MODE should be one of these 4:\n",
-"    -@std               Standard conforming mode. (default)\n",
-"    -@poststd, -@post   special 'post-Standard' mode.\n",
-"    -@kr                K&R 1st mode.\n",
-"    -@oldprep, -@old    'old_preprocessor' mode (i.e. 'Reiser model' cpp).\n",
-
-#if COMPILER == MSC
-"-arch:SSE, -arch:SSE2   Define the macro _M_IX86_FP as 1, 2 respectively.\n",
-#endif
-#if SYSTEM == SYS_MAC && COMPILER == GNUC
-"-arch <arch>        Change the target to <arch> (i386, x86_64, ppc, ppc64).\n",
-#endif
+"mcpp",
+" [-<opts> [-<opts>]] [<infile> [-<opts>] [<outfile>] [-<opts>]]\n",
+"    <infile> defaults to stdin and <outfile> defaults to stdout.\n",
 
-#if ! STD_LINE_PREFIX
-"-b          Output #line lines in C source style.\n",
-#endif
+"\nCommonly used options:\n",
 
 "-C          Output also comments.\n",
 "-D <macro>[=<value>]    Define <macro> as <value> (default:1).\n",
@@ -1441,151 +479,14 @@ static void usage(
 "-e <encoding>   Change the default multi-byte character encoding to one of:\n",
 "            euc_jp, gb2312, ksc5601, big5, sjis, iso2022_jp, utf8.\n",
 
-#if SYSTEM == SYS_MAC
-"-F <framework>      Add <framework> to top of framework directory list.\n",
-#endif
-#if COMPILER == GNUC
-"-finput-charset=<encoding>      Same as -e <encoding>.\n",
-"            (Don't insert spaces around '=').\n",
-#endif
-#if COMPILER == MSC
-"-Fl <file>  Include the <file> prior to the main input file.\n",
-"-G<n>       Define the macro _M_IX86 according to <n>.\n",
-#endif
-#if COMPILER == LCC
-"-g <n>      Define the macro __LCCDEBUGLEVEL as <n>.\n",
-#endif
-
 "-I <directory>      Add <directory> to the #include search list.\n",
 
-#if COMPILER == GNUC
-"-isysroot <dir>     Change root of system header directory to <dir>.\n",
-"-include <file>     Include the <file> prior to the main input file.\n",
-#else
 "-I-         Unset system or site specific include directories.\n",
-#endif
-#if COMPILER == MSC
-"-J          Define the macro _CHAR_UNSIGNED as 1.\n",
-#endif
 
-"-j          Don't output the source line in diagnostics.\n",
-"-M, -MM, -MD, -MMD, -MP, -MQ target, -MT target, -MF file\n",
+"-M file\n",
 "            Output source file dependency line for makefile.\n",
-#if SYS_FAMILY == SYS_UNIX
-"-m32        Change target CPU from x86_64, ppc64 to i386, ppc, respectively.\n",
-"-m64        Change target CPU from i386, ppc to x86_64, ppc64, respectively.\n",
-#endif
-"-N          Don't predefine any non-standard macros.\n",
-
-#if COMPILER == GNUC
-"-nostdinc   Unset system or site specific include directories.\n",
-#endif
-#if COMPILER == LCC
-"-O          Define the macro __LCCOPTIMLEVEL as 1.\n",
-#endif
-
-"-o <file>   Output to <file>.\n",
-"-P          Don't output #line lines.\n",
-"-Q          Output diagnostics to \"mcpp.err\" (default:stderr).\n",
-#if COMPILER == MSC
-"-RTC*       Define the macro __MSVC_RUNTIME_CHECKS as 1.\n",
-#endif
-#if COMPILER == GNUC
-"-traditional, -traditional-cpp      Same as -@oldprep.\n",
-#endif
 "-U <macro>  Undefine <macro>.\n",
 
-#if COMPILER == GNUC
-"-undef      Same as -N.\n",
-#endif
-#if COMPILER == MSC
-"-u          Same as -N.\n",
-#endif
-
-"-v          Show version and include directories of mcpp.\n",
-"-W <level>  Set warning level to <level> (OR of {0,1,2,4,8,16}, default:1).\n",
-
-#if COMPILER == MSC
-"-WL         Same as -j.\n",
-#endif
-#if COMPILER == MSC || COMPILER == GNUC
-"-w          Same as -W0.\n",
-#endif
-#if COMPILER == MSC
-"-X          Same as -I-.\n",
-"-Zc:wchar_t     Define _NATIVE_WCHAR_T_DEFINED and _WCHAR_T_DEFINED as 1.\n",
-"-Zl         Define the macro _VC_NODEFAULTLIB as 1.\n",
-#endif
-
-"-z          Don't output the included file, only defining macros.\n",
-
-"\nOptions available with -@std (default) or -@poststd options:\n",
-
-"-+          Process C++ source.\n",
-
-#if DIGRAPHS_INIT
-"-2          Disable digraphs.\n",
-#else
-"-2          Enable digraphs.\n",
-#endif
-#if COMPILER == GNUC
-"-digraphs   Enable digraphs.\n",
-#endif
-
-"-h <n>      Re-define the pre-defined macro __STDC_HOSTED__ as <n>.\n",
-
-#if COMPILER == GNUC
-"-lang-c89   Same as -S1.\n",
-"-lang-c++   Same as -+.\n",
-"-pedantic, -pedantic-errors     Same as -W7.\n",
-"-S <n>      Redefine __STDC__ to <n>.\n",
-#else
-"-S <n>      Redefine __STDC__ to <n>, undefine old style macros.\n",
-#endif
-
-#if COMPILER == GNUC
-"-std=<STANDARD>     Specify the standard to which the code should conform.\n",
-"            <STANDARD> may be one of: c90, c99, iso9899:1990, iso14882, etc.\n",
-"            iso9899:<n>, iso14882:<n> : Same as -V <n> (long in decimals).\n",
-#endif
-#if COMPILER == MSC
-"-Tp         Same as -+.\n",
-#endif
-
-"-V <n>      Redefine __STDC_VERSION__ or __cplusplus to <n>.\n",
-"            C with -V199901L specifies C99 specs.\n",
-"            C++ with -V199901L specifies C99 compatible specs.\n",
-
-#if COMPILER == GNUC
-"-x c++      Same as -+.\n",
-#endif
-
-"\nOptions available with only -@std (default) option:\n",
-
-"-@compat    Expand recursive macro more than Standard.\n",
-#if TRIGRAPHS_INIT
-"-3          Disable trigraphs.\n",
-#else
-"-3          Enable trigraphs.\n",
-#endif
-"-K          Output macro annotations embedding in comments.\n",
-#if COMPILER == GNUC
-"-trigraphs  Enable trigraphs.\n",
-#endif
-
-"\nOptions available with -@std (default), -@kr or -@oldprep options:\n",
-
-#if COMPILER == GNUC
-"-lang-asm   Same as -x assembler-with-cpp.\n",
-"-x assembler-with-cpp   Process \"assembler\" source.\n",
-#elif   COMPILER == MSC
-"-A          Process \"assembler\" source.\n",
-#else
-"-a          Process \"assembler\" source.\n",
-#endif
-
-"-k          Keep white spaces of input lines as they are.\n",
-
 "\nFor further details see mcpp-manual.html.\n",
         NULL,
     };
@@ -1596,9 +497,7 @@ static void usage(
     if (opt != '?')
         mcpp_fprintf( ERR, illegopt, opt, mcpp_optarg ? mcpp_optarg : null);
     version();
-#if MCPP_LIB
     mes[ 1] = argv0;
-#endif
     while (*mpp)
         mcpp_fputs( *mpp++, ERR);
     longjmp( error_exit, -1);
@@ -1621,27 +520,14 @@ static void set_opt_list(
     "m:",
 #endif
 
-#if COMPILER == GNUC
-    "$A:a:cd:Ef:g:i:l:r:s:t:u:O:p:q:wx:",
-#elif COMPILER == MSC
-    "Aa:F:G:JR:T:XZ:uw",
-#elif   COMPILER == LCC
-    "g:O",
-#endif
-
-#if COMPILER != GNUC && COMPILER != MSC
     "a",
-#endif
-#if SYSTEM == SYS_MAC
-    "F:-:",
-#endif
 
     NULL
     };
 
     const char * const *    lp = & list[ 0];
 
-    strcpy( optlist, "23+@:e:h:jkn:o:vzCD:I:KM:NPQS:U:V:W:");
+    strcpy( optlist, "e:CD:I:M:U:");
                                                 /* Default options  */
     while (*lp)
         strcat( optlist, *lp++);
@@ -1649,46 +535,6 @@ static void set_opt_list(
         cfatal( "Bug: Too long option list", NULL, 0L, NULL);       /* _F_  */
 }
 
-static int  parse_warn_level(
-    const char *    mcpp_optarg,
-    int     opt
-)
-/*
- * Parse warn level option.
- * Warning level option is specified as '19' or '1|2|16' or even '3|16'.
- * Even spaces are allowed as ' 1 | 2|16 '.
- */
-{
-    const char *    cp = mcpp_optarg;
-    int             w, i;
-
-    w = i = 0;
-    while( *cp != EOS) {
-        while( *cp == ' ')
-            cp++;                           /* Skip spaces          */
-        if (! isdigit( *cp))
-            break;                          /* Error    */
-        while (isdigit( *cp)) {
-            i *= 10;
-            i += (*cp++ - '0');
-        }
-        while (*cp == ' ')
-            cp++;
-        if (*cp == '|') {       /* Only digits or '|' are allowed   */
-            w |= i;                         /* Take OR of the args  */
-            i = 0;
-            cp++;
-        }
-    }
-    if (*cp != EOS) {               /* Not ending with digit        */
-        mcpp_fprintf( ERR, "Illegal warning level option \"%s\"\n"
-                , mcpp_optarg);
-        usage( opt);
-    }
-    w |= i;                                 /* Take the last arg    */
-    return  w;
-}
-
 static void def_a_macro(
     int     opt,                            /* 'D'  */
     char *  def                         /* Argument of -D option    */
@@ -1703,11 +549,6 @@ static void def_a_macro(
     char *      cp;
     int         i;
 
-    /* Convert trigraphs for the environment which need trigraphs   */
-    if (mcpp_mode == STD && option_flags.trig)
-        cnv_trigraph( def);
-    if (mcpp_mode == POST_STD && option_flags.dig)
-        cnv_digraph( def);  /* Convert prior to installing macro    */
     definition = xmalloc( strlen( def) + 4);
     strcpy( definition, def);
     if ((cp = strchr( definition, '=')) != NULL) {
@@ -1750,44 +591,15 @@ static void     chk_opts(
 {
     int     incompat = FALSE;
 
-    switch (mcpp_mode) {
-    case STD    :
-    case POST_STD   :
-        if (trad)
-            incompat = TRUE;
-        if (! stdc_val)
-            stdc_val = STDC;
-        break;
-    case KR :
-    case OLD_PREP   :
-#if COMPILER == GNUC
-        if (sflag || cplus_val || ansi || std_val != -1L)
-#else
-        if (sflag || cplus_val || std_val != -1L)
-#endif
-            incompat = TRUE;
-        if (option_flags.dig) {
-            if (option_flags.dig != DIGRAPHS_INIT)
-                incompat = TRUE;
-            else
-                option_flags.dig = 0;
-        }
-        break;
-    }
-
-    if (mcpp_mode == POST_STD
-            && (option_flags.lang_asm || compat_mode || option_flags.k))
+    if (trad)
         incompat = TRUE;
-    if (mcpp_mode != STD && option_flags.trig) {
-        if (option_flags.trig != TRIGRAPHS_INIT)
-            incompat = TRUE;
-        else
-            option_flags.trig = FALSE;
-    }
-    if (mcpp_mode != STD && (mcpp_debug & MACRO_CALL))
+    if (! stdc_val)
+        stdc_val = STDC;
+
+    if (compat_mode)
         incompat = TRUE;
     if ((mcpp_debug & MACRO_CALL)
-                && (option_flags.lang_asm || option_flags.c)) {
+                && option_flags.c) {
             mcpp_fputs( "Disabled -K option.\n", ERR);
             mcpp_debug &= ~MACRO_CALL;
             /* -a and -C options do not co-exist with -K    */
@@ -1797,90 +609,10 @@ static void     chk_opts(
         usage( '?');
     }
 
-    standard = (mcpp_mode == STD || mcpp_mode == POST_STD);
-    /* Modify magic characters in character type table. */
-    if (! standard)
-        char_type[ DEF_MAGIC] = 0;
-    if (mcpp_mode != STD)
-        char_type[ IN_SRC] = 0;
-    if (mcpp_mode == POST_STD || mcpp_mode == KR)
-        char_type[ TOK_SEP] = 0;    /* TOK_SEP equals to COM_SEP    */
-    if (mcpp_mode != STD)
-        char_type[ MAC_INF] = 0;
-
-    expand_init( compat_mode, ansi);
+    expand_init( compat_mode);
                 /* Set function pointer to macro expansion routine  */
 }
 
-#if COMPILER != GNUC
-
-static void init_cpu_macro (
-    int     gval,               /* Argument of -G option for MSC    */
-    int     sse                 /* Argument of -sse: option for MSC */
-)
-/*
- * Set predefined macros for CPU.
- * This routine is called from do_options() only once.
- * GCC-specific-build defines these macro by init_gcc_macro().
- */
-{
-    const char *    cpu_macro[][ 7] = {
-#if SYS_FAMILY == SYS_UNIX
-            { "__i386__"
-#if SYSTEM == SYS_CYGWIN
-                , "_X86_"
-#endif
-                , NULL,},
-            { "__x86_64__", "__amd64__", NULL,},
-            { "__ppc__", "__powerpc__", NULL,},
-            { "__ppc64__", "__powerpc64__", NULL,}
-#elif   SYS_FAMILY == SYS_WIN
-            { "_WIN32", "__WIN32__", "_X86_"
-#if SYSTEM == SYS_MINGW
-                , "__i386__"
-#endif
-                , NULL,},
-            { "_WIN32", "_WIN64", "__WIN64__", "_M_AMD64", "_AMD64_", "_X64_"
-                , NULL,},       /* "_WIN32" is defined even on Windows 64   */
-            { NULL,},                               /* Not supported  */
-            { NULL,}                                /* Not supported  */
-#endif
-        };
-    const char **   macro;
-    int             index;
-
-    if (str_eq( arch, "i386"))
-        index = 0;
-    else if (str_eq( arch, "x86_64"))
-        index = 1;
-    else if (str_eq( arch, "ppc"))
-        index = 2;
-    else if (str_eq( arch, "ppc64"))
-        index = 3;
-    else
-        index = 9;
-
-    if (index == 9) {                               /* Unknown CPU  */
-        look_and_install( "__" CPU "__", DEF_NOARGS_PREDEF, null, "1");
-        return;
-    }
-    macro = cpu_macro[ index];
-    while (*macro)
-        look_and_install( *macro++, DEF_NOARGS_PREDEF, null, "1");
-#if SYS_FAMILY == SYS_WIN
-    if (index == 0) {
-        char    val[] = "600";
-        if (gval)
-            val[ 0] = gval;
-        look_and_install( "_M_IX86", DEF_NOARGS_PREDEF, null, val);
-        val[ 0] = '0' + sse;
-        val[ 1] = '\0';
-        look_and_install( "_M_IX86_FP", DEF_NOARGS_PREDEF, null, val);
-    }
-#endif
-}
-#endif  /* COMPILER != GNUC */
-
 static void init_predefines( void)
 /*
  * Set or unset predefined macros.
@@ -1888,43 +620,23 @@ static void init_predefines( void)
 {
     char    tmp[ 16];
 
-    if (std_val != -1L) {               /* Version is specified     */
-        if (cplus_val)
-            cplus_val = std_val;        /* Value of __cplusplus     */
-        else
-            stdc_ver = std_val;     /* Value of __STDC_VERSION__    */
-    } else {
-        if (! cplus_val)
-            stdc_ver = stdc_val ? STDC_VERSION : 0L;
-    }
+    stdc_ver = stdc_val ? STDC_VERSION : 0L;
 
     if (nflag) {
         un_predefine( TRUE);
-    } else if (stdc_val || cplus_val) {
-#if COMPILER != GNUC
+    } else if (stdc_val) {
         un_predefine( FALSE);           /* Undefine "unix" or so    */
-#endif
     }
-    sprintf( tmp, "%ldL", cplus_val ? cplus_val : stdc_ver);
-    if (cplus_val) {
-        look_and_install( "__cplusplus", DEF_NOARGS_STANDARD, null, tmp);
-    } else {
-        if (stdc_ver)
-            look_and_install( "__STDC_VERSION__", DEF_NOARGS_STANDARD, null
-                    , tmp);
+    sprintf( tmp, "%ldL", stdc_ver);
+    if (stdc_ver)
+        look_and_install( "__STDC_VERSION__", DEF_NOARGS_STANDARD, null
+                , tmp);
 #ifdef  COMPILER_CPLUS
-        if (! nflag)        /* Undefine pre-defined macro for C++   */
-            undefine( COMPILER_CPLUS);
+    if (! nflag)        /* Undefine pre-defined macro for C++   */
+        undefine( COMPILER_CPLUS);
 #endif
-    }
     set_limit();
-    stdc2 = cplus_val || stdc_ver >= 199901L;
-    stdc3 = (cplus_val >= 199901L) || (stdc_ver >= 199901L);
-        /* (cplus_val >= 199901L) makes C++ C99-compatible specs    */
-    if (standard)
-        init_std_defines();
-    if (stdc3)
-        set_pragma_op();
+    init_std_defines();
 }
 
 static void init_std_defines( void)
@@ -1967,10 +679,6 @@ static void init_std_defines( void)
         sprintf( tmp, "%d", STDC_HOSTED);
         look_and_install( "__STDC_HOSTED__", DEF_NOARGS_PREDEF, null, tmp);
     }
-#if COMPILER != GNUC        /* GCC do not undefine __STDC__ on C++  */
-    if (cplus_val)
-        return;
-#endif
     /* Define __STDC__ as 1 or such for Standard conforming compiler.   */
     if (! look_id( "__STDC__")) {
         sprintf( tmp, "%d", stdc_val);
@@ -1986,52 +694,17 @@ static void set_limit( void)
  * Set the minimum translation limits specified by the Standards.
  */
 {
-    if (cplus_val) {            /* Specified by C++ 1998 Standard   */
-        std_limits.str_len = SLEN_CPLUS_MIN;
-        std_limits.id_len = IDLEN_CPLUS_MIN;
-        std_limits.n_mac_pars = NMACPARS_CPLUS_MIN;
-        std_limits.exp_nest = EXP_NEST_CPLUS_MIN;
-        std_limits.blk_nest = BLK_NEST_CPLUS_MIN;
-        std_limits.inc_nest = INCLUDE_NEST_CPLUS_MIN;
-        std_limits.n_macro = NMACRO_CPLUS_MIN;
-        std_limits.line_num = LINE_CPLUS_LIMIT;
-    } else if (stdc_ver >= 199901L) {       /* Specified by C 1999 Standard */
-        std_limits.str_len = SLEN99MIN;
-        std_limits.id_len = IDLEN99MIN;
-        std_limits.n_mac_pars = NMACPARS99MIN;
-        std_limits.exp_nest = EXP_NEST99MIN;
-        std_limits.blk_nest = BLK_NEST99MIN;
-        std_limits.inc_nest = INCLUDE_NEST99MIN;
-        std_limits.n_macro = NMACRO99MIN;
-        std_limits.line_num = LINE99LIMIT;
-    } else if (standard) {          /* Specified by C 1990 Standard */
-        std_limits.str_len = SLEN90MIN;
-        std_limits.id_len = IDLEN90MIN;
-        std_limits.n_mac_pars = NMACPARS90MIN;
-        std_limits.exp_nest = EXP_NEST90MIN;
-        std_limits.blk_nest = BLK_NEST90MIN;
-        std_limits.inc_nest = INCLUDE_NEST90MIN;
-        std_limits.n_macro = NMACRO90MIN;
-        std_limits.line_num = LINE90LIMIT;
-    }
-    /* Else pre-Standard mode   */
+    /* Specified by C 1990 Standard */
+    std_limits.str_len = SLEN90MIN;
+    std_limits.id_len = IDLEN90MIN;
+    std_limits.n_mac_pars = NMACPARS90MIN;
+    std_limits.exp_nest = EXP_NEST90MIN;
+    std_limits.blk_nest = BLK_NEST90MIN;
+    std_limits.inc_nest = INCLUDE_NEST90MIN;
+    std_limits.n_macro = NMACRO90MIN;
+    std_limits.line_num = LINE90LIMIT;
 }
 
-static void set_pragma_op( void)
-/*
- *      #define _Pragma(a)  _Pragma ( a )
- * Define _Pragma() operator as a special macro so as to be searched
- * easily.  The unusual 'DEF_PRAGMA' is a marker of this psuedo
- * macro.
- */
-{
-    char *  name = "_Pragma";
-    char    tmp[ 16];
-
-    sprintf( tmp, "%c%s ( %c%c )", DEF_MAGIC, name, MAC_PARM, 1);
-                                                /* Replacement text */
-    look_and_install( name, DEF_PRAGMA, "a", tmp);
-}
 
 void    init_sys_macro( void)
 /*
@@ -2041,15 +714,7 @@ void    init_sys_macro( void)
 {
     /* This order is important. */
     def_macros();               /* Define macros specified by -D    */
-#if COMPILER == GNUC
-    chk_env();
-#endif
     init_predefines();                  /* Define predefined macros */
-#if COMPILER == GNUC
-    init_gcc_macro();
-#elif   COMPILER == MSC
-    init_msc_macro();
-#endif
     undef_macros();             /* Undefine macros specified by -U  */
     if (mcpp_debug & MACRO_CALL)
         dump_def( FALSE, TRUE);     /* Finally putout current macro names   */
@@ -2060,43 +725,9 @@ void    at_start( void)
  * Do the commands prior to processing main source file after do_options().
  */
 {
-    char *  env;
     FILEINFO *      file_saved = infile;
 
-    /*
-     * Set multi-byte character encoding according to environment variables
-     * LC_ALL, LC_CTYPE and LANG -- with preference in this order.
-     */
-    if (! mb_changed) {                     /* -m option precedes   */
-        if ((env = getenv( "LC_ALL")) != NULL)
-            set_encoding( env, "LC_ALL", 0);
-        else if ((env = getenv( "LC_CTYPE")) != NULL)
-            set_encoding( env, "LC_CTYPE", 0);
-        else if ((env = getenv( "LANG")) != NULL)
-            set_encoding( env, "LANG", 0);
-    }
-
-#if COMPILER == GNUC || COMPILER == MSC
-    if (option_flags.dollar_in_name)
-        char_type[ 0x24] |= LET;    /* Enable '$' in identifiers    */
-    /*
-     * Do the -include (-Fl for MSC) options in the specified order.
-     * Note: This functionality is implemented as nested #includes
-     *   which results the same effect as sequential #includes.
-     */
-    {
-        char **         preinc;
-        /*
-         * Note: Here, 'infile' is the main input file, which is pseudo-
-         * parent file of the files to pre-include.  So, we must
-         * temporarily set the infile's directory to the current directory
-         * in order to preinclude the files relative to it.
-         */
-        preinc = preinc_end;
-        while (preinclude <= --preinc && *preinc != NULL)
-            open_file( &null, NULL, *preinc, TRUE, TRUE, FALSE);
-    }
-#endif
+    // We don't support changing the encodings.
 
     put_info( file_saved);
 }
@@ -2108,27 +739,11 @@ static void put_info(
  * Putout compiler-specific information.
  */
 {
-    if (no_output || option_flags.p)
+    if (no_output)
         return;
     sharp_file->line++;
     sharp( sharp_file, 0);
     sharp_file->line--;
-#if COMPILER == GNUC
-    if (gcc_work_dir)
-        mcpp_fprintf( OUT, "%s%ld \"%s%c\"\n"
-                , std_line_prefix ? "#line " : LINE_PREFIX
-                , 1, cur_work_dir, '/');
-        /* Putout the current directory as a #line line as: */
-        /* '# 1 "/abs-path/cur_dir//"'.                     */
-    mcpp_fprintf( OUT, "%s%ld \"<built-in>\"\n"
-                , std_line_prefix ? "#line " : LINE_PREFIX , 1);
-    mcpp_fprintf( OUT, "%s%ld \"<command line>\"\n"
-                , std_line_prefix ? "#line " : LINE_PREFIX , 1);
-    mcpp_fprintf( OUT, "%s%ld \"%s\"%s\n"
-            , std_line_prefix ? "#line " : LINE_PREFIX, 1, cur_fullname
-            , ! str_eq( cur_fullname, sharp_file->full_fname) ? " 1" : null);
-            /* Suffix " 1" for the file specified by -include   */
-#endif
 }
 
 static char *   set_files(
@@ -2173,10 +788,6 @@ static void set_env_dirs( void)
 {
     const char *    env;
 
-    if (cplus_val) {
-        if ((env = getenv( ENV_CPLUS_INCLUDE_DIR)) != NULL)
-            parse_env( env);
-    }
     if ((env = getenv( ENV_C_INCLUDE_DIR)) != NULL)
         parse_env( env);
 }
@@ -2220,21 +831,6 @@ static void set_sys_dirs(
  * list.
  */
 {
-    if (cplus_val && set_cplus_dir) {
-#ifdef  CPLUS_INCLUDE_DIR1
-        set_a_dir( CPLUS_INCLUDE_DIR1);
-#endif
-#ifdef  CPLUS_INCLUDE_DIR2
-        set_a_dir( CPLUS_INCLUDE_DIR2);
-#endif
-#ifdef  CPLUS_INCLUDE_DIR3
-        set_a_dir( CPLUS_INCLUDE_DIR3);
-#endif
-#ifdef  CPLUS_INCLUDE_DIR4
-        set_a_dir( CPLUS_INCLUDE_DIR4);
-#endif
-    }
-
 #if SYS_FAMILY == SYS_UNIX
     set_a_dir( "/usr/local/include");
 #endif
@@ -2283,24 +879,9 @@ static void set_a_dir(
         incdir = (const char **) xmalloc( sizeof (char *) * max_inc);
         incend = &incdir[ 0];
     } else if (incend - incdir >= max_inc) {        /* Buffer full  */
-#if SYSTEM == SYS_MAC
-        size_t  framework_pos = to_search_framework - incdir;
-#endif
-#if COMPILER == GNUC
-        size_t  sys_pos = 0;
-        if (sys_dirp)
-            sys_pos = sys_dirp - incdir;
-#endif
         incdir = (const char **) xrealloc( (void *) incdir
                 , sizeof (char *) * max_inc * 2);
         incend = &incdir[ max_inc];
-#if COMPILER == GNUC
-        if (sys_pos)
-            sys_dirp = &incdir[ sys_pos];
-#endif
-#if SYSTEM == SYS_MAC
-        to_search_framework = &incdir[ framework_pos];
-#endif
         max_inc *= 2;                   
     }
 
@@ -2311,9 +892,6 @@ static void set_a_dir(
         return;
     for (ip = incdir; ip < incend; ip++) {
         if (str_case_eq( *ip, norm_name)) {
-            if (option_flags.v && ! (mcpp_debug & MACRO_CALL))
-                mcpp_fprintf( ERR, "Duplicate directory \"%s\" is ignored\n"
-                        , norm_name);
             free( norm_name);               /* Already registered   */
             return;
         }
@@ -2322,41 +900,6 @@ static void set_a_dir(
     *incend++ = norm_name;
 }
 
-#if SYSTEM == SYS_MAC && COMPILER == GNUC
-/* Definitions for "header map" file of Xcode / Apple-GCC.          */
-/* These definitions were taken from cpplib.h of Apple-GCC-4.0.1    */
-
-#define HMAP_SAME_ENDIANNESS_MAGIC      \
-        (((((('h' << 8) | 'm') << 8) | 'a') << 8) | 'p')
-
-typedef unsigned short  uint16;
-typedef unsigned int    uint32;
-
-struct hmap_bucket
-{
-    uint32  key;            /* Offset (into strings) of key             */
-    struct {
-        uint32  prefix;     /* Offset (into strings) of value prefix    */
-        uint32  suffix;     /* Offset (into strings) of value suffix    */
-    } value;                /* Value (prefix- and suffix-strings)       */
-};
-
-struct hmap_header_map
-{
-    uint32  magic;          /* Magic word, also indicates byte order    */
-    uint16  version;        /* Version number -- currently 1            */
-    uint16  _reserved;      /* Reserved for future use -- zero for now  */
-    uint32  strings_offset; /* Offset to start of string pool           */
-    uint32  count;          /* Number of entries in the string table    */
-    uint32  capacity;       /* Number of buckets (always a power of 2)  */
-    uint32  max_value_length;
-                        /* Length of longest result path (excl. '\0')   */
-    struct hmap_bucket  buckets[1];
-                        /* Inline array of 'capacity' maptable buckets  */
-    /* Strings follow the buckets, at strings_offset.  */
-};
-#endif
-
 static char *   norm_dir(
     const char *    dirname,        /* Directory path to normalize  */
     int             framework       /* Setting a framework directory*/
@@ -2368,43 +911,10 @@ static char *   norm_dir(
 {
     char *  norm_name;
 
-#if COMPILER == GNUC
-    if (sysroot && sys_dirp) {
-        /* Logical system root specified and dirname is system header dir   */
-        char    delim[ 2] = { EOS, EOS};
-        char *  dir;
-#if SYSTEM == SYS_MAC
-        if (! framework && memcmp( dirname, "/usr/", 5) != 0)
-            return  NULL;           /* /Developer/usr/lib/gcc/      */
-#endif
-        if (dirname[ 0] != PATH_DELIM)
-            delim[ 0] = PATH_DELIM;
-        dir = xmalloc( strlen( sysroot) + strlen( dirname) + 2);
-        sprintf( dir, "%s%s%s", sysroot, delim, dirname);
-        dirname = dir;
-    }
-#endif
-#if SYSTEM == SYS_MAC && COMPILER == GNUC
-    if (strlen( dirname) > 5
-            && str_case_eq( dirname + strlen( dirname) - 5, ".hmap")) {
-        /* "header map" file (not an include directory) */
-        norm_name = norm_path( null, dirname, FALSE, TRUE);
-        if (! norm_name && option_flags.v)
-            mcpp_fprintf( ERR, "Invalid header map file \"%s\" is ignored\n"
-                    , dirname);
-    } else 
-#endif
     {
         norm_name = norm_path( dirname, NULL, FALSE, FALSE);
                             /* Normalize the pathname to compare    */
-        if (! norm_name && option_flags.v && ! (mcpp_debug & MACRO_CALL))
-            mcpp_fprintf( ERR, "Non-existent directory \"%s\" is ignored\n"
-                    , dirname);
     }
-#if COMPILER == GNUC
-    if (sysroot && sys_dirp)
-        free( dirname);
-#endif
 
     return  norm_name;
 }
@@ -2479,18 +989,6 @@ static char *   norm_path(
             || (fname && ! S_ISREG( st_buf.st_mode)))
                 /* Not a regular file though 'fname' is specified   */
         return  NULL;
-#if SYSTEM == SYS_MAC && COMPILER == GNUC
-    if (hmap) {                         /* Dirty "header map" file  */
-        struct hmap_header_map  hmap;
-        size_t      cnt;
-        FILE *      fp;
-        fp = fopen( fname, "r");
-        cnt = fread( & hmap, sizeof (struct hmap_header_map), 1, fp);
-        fclose( fp);
-        if (cnt == 0 || hmap.magic != HMAP_SAME_ENDIANNESS_MAGIC)
-            return  NULL;
-    }
-#endif
     if (! fname) {
         slbuf1[ len] = PATH_DELIM;          /* Append PATH_DELIM    */
         slbuf1[ ++len] = EOS;
@@ -2678,160 +1176,31 @@ static void     deref_syml(
 /* Dereference symbolic linked directory    */
 {
     char *      cp2;
-    int         len;                /* Should be int, not size_t    */
-
-    while ((chk_start = strchr( chk_start, PATH_DELIM)) != NULL) {
-        *chk_start = EOS;
-        if ((len = readlink( slbuf1, slbuf2, PATHMAX)) > 0) {
-            /* Dereference symbolic linked directory    */
-            cp2 = strrchr( slbuf1, PATH_DELIM); /* Previous delimiter       */
-            *chk_start = PATH_DELIM;
-            strcpy( slbuf2 + len, chk_start);
-            if (slbuf2[ 0] == PATH_DELIM) {     /* Absolute path    */
-                strcpy( slbuf1, slbuf2);
-                chk_start = slbuf1 + len + 1;
-            } else {
-                if (cp2)
-                    chk_start = cp2 + 1;
-                else
-                    chk_start = slbuf1;
-                strcpy( chk_start, slbuf2);     /* Rewrite the path */
-                chk_start += len;
-            }
-        } else {
-            *chk_start++ = PATH_DELIM;
-        }
-    }
-}
-#endif
-
-#if COMPILER == GNUC
-
-static void init_gcc_macro( void)
-/*
- * Predefine GCC macros.
- * This routine should be called after opening output file in order to putout
- * macro informations by -K option into the file.
- * Also this routine should be called before undef_macros() in order to
- * permit undefining a macro by -U option.
- */
-{
-    char        fname[ BUFSIZ];
-    char        lbuf[ BUFSIZ];
-    char *      include_dir;    /* The version-specific include directory   */
-    char *      tmp;
-    FILE *      fp;
-    DEFBUF *    defp;
-    const char *    cp;
-    char *      tp;
-    int         i;
-
-    if (nflag)                                  /* -undef option    */
-        goto  undef_special;
-
-    tmp = xmalloc( strlen( INC_DIR) + strlen( "/mingw/mcpp-gcc-")
-            + strlen( arch) + 1);
-#if SYSTEM == SYS_CYGWIN
-    if (no_cygwin) {
-        sprintf( tmp, "%s/mingw/mcpp-gcc-%s", INC_DIR, arch);
-    } else {
-        sprintf( tmp, "%s/mcpp-gcc-%s", INC_DIR, arch);
-    }
-#else
-    sprintf( tmp, "%s/mcpp-gcc-%s", INC_DIR, arch);
-#endif
-    include_dir = norm_path( tmp, NULL, TRUE, FALSE);
-    free( tmp);
-
-    for (i = 0; i <= 1; i++) {
-        int         nargs;
-
-        if ((mcpp_mode == POST_STD || ansi) && i == 0)
-            continue;   /* POST_STD or __STRICT_ANSI__ does not     */
-                        /*      predefine non-conforming macros     */
-        /* The predefined macro file    */
-        cp = i ? "std" : "old";
-        sprintf( fname, "%sg%s%d%d_predef_%s.h"
-                , include_dir, cplus_val ? "xx" : "cc"
-                , gcc_maj_ver, gcc_min_ver, cp);
-            /* Note that norm_path() append a PATH_DELIM.   */
-        if ((fp = fopen( fname, "r")) == NULL) {
-            mcpp_fprintf( ERR, "The mode for %s has not been installed.\n"
-                    , arch);
-            longjmp( error_exit, -1);
-        }
-        nargs = i ? 0 : DEF_NOARGS_PREDEF_OLD;
-            /* g*_predef_std.h has DEF_NOARGS_PREDEF or non-negative args   */
-            /* while g*_predef_old.h has only DEF_NOARGS_PREDEF_OLD args    */
-        while (fgets( lbuf, BUFSIZ, fp) != NULL) {
-            unget_string( lbuf, "gcc_predefine");
-            if (skip_ws() == '#'
-                && scan_token( skip_ws(), (tp = work_buf, &tp), work_end)
-                        == NAM
-                    && str_eq( work_buf, "define")) {
-                defp = do_define( TRUE, nargs);     /* Ignore re-definition */ 
-            }
-            skip_nl();
-        }
-    }
-    free( include_dir);
-
-undef_special:
-    if (look_id( "__OPTIMIZE__"))       /* -O option is specified   */
-        undefine( "__NO_INLINE__");
-}
-
-static void chk_env( void)
-/*
- * Check the environment variables to specify output of dependency lines.
- */
-{
-    char *  env;
-    char *  cp;
-
-    /* Output of dependency lines   */
-    if ((env = getenv( "DEPENDENCIES_OUTPUT")) == NULL) {
-        if ((env = getenv( "SUNPRO_DEPENDENCIES")) == NULL)
-            return;
-        else
-            mkdep |= MD_SYSHEADER;
-    }
-    mkdep |= MD_MKDEP;
-    if ((cp = strchr( env, ' ')) != NULL) {
-        *cp++ = EOS;
-        while (*cp == ' ')
-            cp++;
-    }
-    if (! mkdep_fp)                 /* Command line option precedes */
-        mkdep_fp = fopen( env, "a");
-    if (! mkdep_target)
-        mkdep_target = cp;
-}
-
-#elif   COMPILER == MSC
-
-static void init_msc_macro( void)
-/*
- * Define a few MSC-specific predefined macros.
- */
-{
-    DEFBUF *    defp;
-    int         i;
+    int         len;                /* Should be int, not size_t    */
 
-    defp = look_id( "_MSC_VER");
-    i = atoi( defp->repl);
-    if (i >= 1400) {                        /* _MSC_VER >= 1400     */
-        look_and_install( "_MT", DEF_NOARGS_PREDEF, null, "1");
-        if (cplus_val && ! wchar_t_modified) {
-            /* -Zc:wchar_t- was not specified   */
-            look_and_install( "_NATIVE_WCHAR_T_DEFINED", DEF_NOARGS_PREDEF
-                    , null, "1");
-            look_and_install( "_WCHAR_T_DEFINED", DEF_NOARGS_PREDEF, null
-                    , "1");
+    while ((chk_start = strchr( chk_start, PATH_DELIM)) != NULL) {
+        *chk_start = EOS;
+        if ((len = readlink( slbuf1, slbuf2, PATHMAX)) > 0) {
+            /* Dereference symbolic linked directory    */
+            cp2 = strrchr( slbuf1, PATH_DELIM); /* Previous delimiter       */
+            *chk_start = PATH_DELIM;
+            strcpy( slbuf2 + len, chk_start);
+            if (slbuf2[ 0] == PATH_DELIM) {     /* Absolute path    */
+                strcpy( slbuf1, slbuf2);
+                chk_start = slbuf1 + len + 1;
+            } else {
+                if (cp2)
+                    chk_start = cp2 + 1;
+                else
+                    chk_start = slbuf1;
+                strcpy( chk_start, slbuf2);     /* Rewrite the path */
+                chk_start += len;
+            }
+        } else {
+            *chk_start++ = PATH_DELIM;
         }
     }
 }
-
 #endif
 
 static void     def_macros( void)
@@ -2888,12 +1257,10 @@ void    put_depend(
     size_t          fnamlen;                /* Length of filename   */
 
     if (fp == NULL) {   /* Main source file.  Have to initialize.   */
-#if MCPP_LIB
         if (output != NULL) {
             free( output);
             free( pos);
         }
-#endif
         output = xmalloc( mkdep_len = MKDEP_INITLEN);
         pos = (size_t *) xmalloc( (pos_max = MKDEP_INIT) * sizeof (size_t));
         out_p = md_init( filename, output);
@@ -3104,7 +1471,7 @@ int     do_include(
     }
     fname = infile->bptr - 1;       /* Current token for diagnosis  */
 
-    if (standard && (char_type[ delim] & LET)) {    /* Maybe macro  */
+    if ((char_type[ delim] & LET)) {    /* Maybe macro  */
         int     c;
         char    *hp;
 
@@ -3148,17 +1515,9 @@ found_name:
     fname = save_string( &work_buf[ 1]);    /*  the starting delimiter. */
 
     if (skip_ws() != '\n') {
-        if (standard) {
-            cerror( excess_token, infile->bptr-1, 0L, NULL);
-            skip_nl();
-            goto  error;
-        } else if (mcpp_mode == OLD_PREP) {
-            skip_nl();
-        } else {
-            if (warn_level & 1)
-                cwarn( excess_token, infile->bptr-1, 0L, NULL);
-            skip_nl();
-        }
+        cerror( excess_token, infile->bptr-1, 0L, NULL);
+        skip_nl();
+        goto  error;
     }
 
 #if SYS_FAMILY == SYS_WIN
@@ -3224,14 +1583,6 @@ static int  open_include(
     if (mcpp_debug & PATH)
         mcpp_fprintf( DBG, "filename: %s\n", filename);
 
-#if COMPILER == GNUC
-    if (! full_path) {
-        if (i_split                     /* -I- option is specified  */
-                || next)                        /* or #include_next */
-        goto  search_dirs;
-    }
-#endif
-
     if ((searchlocal && ((search_rule & CURRENT) || !has_dir)) || full_path) {
         /*
          * Look in local directory first.
@@ -3253,28 +1604,6 @@ static int  open_include(
             return  TRUE;
     }
 
-#if COMPILER == MSC
-    if (searchlocal) {
-        /* Visual C searches ancestor source's directory, too.  */
-        FILEINFO *  file = infile;
-        while ((file = file->parent) != NULL) {
-            /* Search each parent includer's directory  */
-            if (open_file( file->dirp, src_dir, filename, TRUE, FALSE, FALSE))
-                return  TRUE;
-        }
-    }
-#endif
-#if COMPILER == GNUC
-search_dirs:
-    if (searchlocal) {
-        /* Search the directories specified by -iquote option, if any.  */
-        const char **   qdir;
-        for (qdir = quote_dir; qdir < quote_dir_end; qdir++) {
-            if (open_file( qdir, NULL, filename, FALSE, FALSE, FALSE))
-                return  TRUE;
-        }
-    }
-#endif
     /* Search the include directories   */
     if (search_dir( filename, searchlocal, next))
         return  TRUE;
@@ -3344,26 +1673,10 @@ static int  search_dir(
     const char **   incptr;                 /* -> inlcude directory */
 
     incptr = incdir;
-#if COMPILER == GNUC
-    if (next && **inc_dirp != EOS)
-        incptr = inc_dirp + 1;
-        /* In case of include_next search after the includer's directory    */
-#endif
 
     for ( ; incptr < incend; incptr++) {
         if (strlen( *incptr) + strlen( filename) >= PATHMAX)
             cfatal( toolong_fname, *incptr, 0L, filename);  /* _F_  */
-#if SYSTEM == SYS_MAC
-        if (incptr == to_search_framework && ! searchlocal) {
-                                /* Now search the framework dirs    */
-            if (search_framework( filename)) {          /* Found    */
-                if (in_import)  /* "#import"ed file is once only    */
-                    do_once( infile->full_fname);
-                return  TRUE;
-            }
-            /* Else continue to search incptr   */
-        }
-#endif
         if (open_file( incptr, NULL, filename, FALSE, FALSE, FALSE))
             /* Now infile has been renewed  */
             return  TRUE;
@@ -3400,17 +1713,6 @@ static int  open_file(
     const char *    fname;
 
     errno = 0;      /* Clear errno possibly set by path searching   */
-#if SYSTEM == SYS_MAC && COMPILER == GNUC
-    if (strlen( *dirp) > 5
-            && str_case_eq( *dirp + strlen( *dirp) - 5, ".hmap")) {
-        /* Search header map file for a header  */
-        if (! search_header_map( *dirp, filename, dir_fname))
-            return  NULL;
-        fname = dir_fname;                  /* Found a path-list    */
-        dirp = &null;
-        goto  search;
-    } else
-#endif
     {
         if (mcpp_debug & PATH)
             mcpp_fprintf( DBG, "Searching %s%s%s\n", *dirp
@@ -3425,12 +1727,12 @@ static int  open_file(
     } else {
         fname = filename;
     }
-search:
+
     fullname = norm_path( *dirp, fname, TRUE, FALSE);
                                     /* Convert to absolute path     */
     if (! fullname)                 /* Non-existent or directory    */
         return  FALSE;
-    if (standard && included( fullname))        /* Once included    */
+    if (included( fullname))        /* Once included    */
         goto  true;
         
     if ((max_open != 0 && max_open <= include_nest)
@@ -3483,25 +1785,10 @@ search:
     infile->dirp = inc_dirp = dirp;
 #if 0   /* This part is only for debugging  */
     chk_dirp( dirp);
-#endif
-#if COMPILER == GNUC
-    if ((**dirp != EOS && sys_dirp <= dirp && dirp <= incend)
-#if SYSTEM == SYS_MAC
-            || sys_frame
-#endif
-            )
-        infile->sys_header = TRUE;      /* Found in a system header dir     */
-    else
-        infile->sys_header = FALSE;
 #endif
     cur_fullname = fullname;
 
-    if (option_flags.z) {
-        no_output++;        /* Don't output the included file       */
-        if (include_nest == 2)
-            mcpp_fprintf( OUT, "#include \"%s\"\n", fullname);
-            /* Output #include line instead, if it is in main source file   */
-    } else if (! include_opt) {     /* Do not sharp() on -include   */
+    if (! include_opt) {     /* Do not sharp() on -include   */
         src_line = 1;                   /* Working on line 1 now    */
         sharp( NULL, 1);    /* Print out the included file name     */
     }
@@ -3538,7 +1825,7 @@ void    add_file(
     //
     // When encoding is UTF-8, skip BOM if present.
     //
-    if(mbchar == UTF8 && fp != NULL && ftell(fp) == 0)
+    if(fp != NULL && ftell(fp) == 0)
     {
         const unsigned char UTF8_BOM[3] = {0xEF, 0xBB, 0xBF};
         unsigned char FILE_HEAD[3] = {0, 0, 0};
@@ -3570,7 +1857,7 @@ void    add_file(
 
     if (include_nest >= INCLUDE_NEST)   /* Probably recursive #include      */
         cfatal( too_many_include_nest, NULL, (long) INCLUDE_NEST, NULL);
-    if (standard && (warn_level & 4)
+    if ((warn_level & 4)
             && include_nest == std_limits.inc_nest + 1)
         cwarn( too_many_include_nest, NULL, (long) std_limits.inc_nest, NULL);
     include_nest++;
@@ -3616,228 +1903,6 @@ static const char *     set_fname(
     return  filename;
 }
 
-#if SYSTEM == SYS_MAC
-#if COMPILER == GNUC
-
-/* Routines to search "header map" file of Xcode / Apple-GCC.       */
-/* search_header_map() and hmap_hash() were written referring to    */
-/* c-incpath.c of Apple-GCC-4.0.1.                                  */
-
-static char *   search_header_map(
-    const char *    hmap_file,              /* Header map file      */
-    const char *    filename,               /* Filename to search   */
-    char *          pathlist        /* Buffer for a found pathlist  */
-)
-/*
- * Search a table in "header map" file for a header.
- */
-{
-    struct stat     stat_buf;
-    FILE *          fp;
-    size_t          fsize;
-    const char *    contents;
-    struct hmap_header_map *    hmap;
-    struct hmap_bucket *        buckets;
-    const char *    strings;
-    uint32          mask;
-    uint32          key_offs;
-    uint32          i;
-
-    stat( hmap_file, &stat_buf);            /* Get size of the file */
-    fsize = stat_buf.st_size;
-    contents = xmalloc( fsize + 1);
-    fp = fopen( hmap_file, "r");
-    fread( contents, fsize, 1, fp);     /* Read whole of the file at once   */
-    hmap = (struct hmap_header_map *) contents;
-
-    strings = ((const char *) hmap) + hmap->strings_offset;
-    buckets = hmap->buckets;
-    mask = hmap->capacity - 1;
-    i = hmap_hash( filename) & mask;
-    while ((key_offs = buckets[ i].key) != 0) {
-        if (str_case_eq( filename, strings + key_offs)) {
-            /* The names match.  Make path-list.    */
-            char *  cp = stpcpy( pathlist, strings + buckets[ i].value.prefix);
-            strcpy( cp, strings + buckets[ i].value.suffix);
-            break;
-        }
-        i = ++i & mask;
-    }
-    free( contents);
-    return  key_offs ? pathlist : NULL;
-}
-
-static unsigned hmap_hash(
-    const char *    fname                   /* header name          */
-)
-/*
- * Get hash value for the fname.
- */
-{
-    const char *    sp;
-    unsigned        hash_code = 0;
-
-    for (sp = fname; *sp; sp++)
-        hash_code += tolower( *sp & 0xFF) * 13;
-    return  hash_code;
-}
-#endif  /* COMPILER == GNUC */
-
-static void     init_framework( void)
-/*
- * Initialize framework[].
- */
-{
-    char *  framework_dir;
-    /* Some frameworks may have been already specified by -F option.    */
-    sys_framework = num_framework;      /* These are system frameworks  */
-#ifdef  FRAMEWORK1
-    framework_dir = norm_dir( FRAMEWORK1, TRUE);
-    if (framework_dir)
-        framework[ num_framework++] = framework_dir;
-#endif
-#ifdef  FRAMEWORK2
-    framework_dir = norm_dir( FRAMEWORK2, TRUE);
-    if (framework_dir)
-        framework[ num_framework++] = framework_dir;
-#endif
-#ifdef  FRAMEWORK3
-    framework_dir = norm_dir( FRAMEWORK3, TRUE);
-    if (framework_dir)
-        framework[ num_framework++] = framework_dir;
-#endif
-    if (num_framework >= MAX_FRAMEWORK) {
-        mcpp_fputs( "Too many Framework directories.", ERR);
-        longjmp( error_exit, -1);
-    }
-}
-
-static const char *     dot_frame = ".framework";
-
-static int      search_framework(
-    char *  filename
-)
-/*
- * Search "Framework" directories.
- * 'frame/header.h' is converted to
- * '/System/Library/Frameworks/frame.framework/Headers/header.h',
- * '/System/Library/Frameworks/frame.framework/PrivateHeaders/header.h',
- * and so on.
- */
-{
-    char        fullname[ PATHMAX + 1];
-    FILEINFO *  file;
-    char *      frame, * fname, * cp1, * cp2;
-    int         sys_frame = FALSE;
-    int         i;
-
-    cp1 = cp2 = strchr( filename, PATH_DELIM);
-    /*
-     * 'filename' should be <frame/header> format or sometimes
-     *      <frame/dir/header>.
-     * e.g.: <Foundation/Foundation.h>, <CarbonCore/OSUtils.h>
-     *      or <IOKit/pwr_mgt/IOPMLib.h>.
-     */
-    if (! cp1)
-        return  FALSE;
-    *cp1 = EOS;
-    frame = filename;
-    fname = cp1 + 1;
-
-    /* Search framework[] directories   */
-    for (i = 0; i < num_framework; i++) {
-        cp1 = stpcpy( fullname, framework[ i]);
-                    /* 'fullname' e.g.: /System/Library/Frameworks/ */
-        if (search_subdir( fullname, cp1, frame, fname, sys_framework <= i))
-            return  TRUE;
-    }
-
-    /*
-     * Search subframework dirs searching its possible parent framework
-     * starting from current file's directory to its ancestors.
-     * Header file in subframework directories should be included only
-     * by its parent or sibling framework headers.
-     */
-    for (i = sys_framework; i < num_framework; i++) {
-        size_t  frame_len, fname_len;
-        frame_len = strlen( framework[ i]);
-        fname_len = strlen( infile->real_fname);
-        if (fname_len <= frame_len)
-            continue;
-        if (memcmp( framework[ i], infile->real_fname, frame_len) == 0) {
-            sys_frame = TRUE;
-            break;
-        }
-    }
-    for (file = infile; file; file = file->parent) {
-        const char *    dot;
-        size_t  len;
-
-        if (! file->fp)
-            continue;
-        dot = strstr( file->real_fname, dot_frame);
-        if (! dot)
-            continue;
-        len = dot - file->real_fname + strlen( dot_frame) + 1;
-        memcpy( fullname, file->real_fname, len);
-        cp1 = fullname + len;
-        cp1 = stpcpy( cp1, "Frameworks/");
-        /* 'fullname' e.g.:                                             */
-        /* /System/Library/Frameworks/Foundation.framework/Frameworks/  */
-        if (search_subdir( fullname, cp1, frame, fname, sys_frame))
-            return  TRUE;
-    }
-
-    *cp2 = PATH_DELIM;      /* Restore original include file format */ 
-
-    return  FALSE;
-}
-
-static int      search_subdir(
-    char *  fullname,               /* Buffer for path-list to open */
-    char *  cp,                     /* Latter half of 'fullname'    */
-    char *  frame,                  /* 'frame' of <frame/header>    */
-    char *  fname,                  /* 'header' of <frame/header>   */
-                /* or sometimes 'dir/header' of <frame/dir/header>  */
-    int     sys_frame               /* System framework header ?    */
-)
-/*
- * Make path-list and try to open.
- */
-{
-    static const char *     subdir[] = { "Headers", "PrivateHeaders", NULL};
-    int     j, n;
-
-    cp += sprintf( cp, "%s%s%c", frame, dot_frame, PATH_DELIM);
-    for (j = 0; subdir[ j] != NULL; j++) {
-        n = sprintf( cp, "%s%c%s", subdir[ j], PATH_DELIM, fname);
-        /*
-         * 'fullname' is for example:
-         * /System/Library/Frameworks/Foundation.framework/Headers/
-         *      Foundation.h,
-         * /System/Library/Frameworks/Foundation.framework/Frameworks/
-         *      CarbonCore.framework/Headers/OSUtils.h,
-         * or /System/Library/Frameworks/IOKit.framework/Headers/
-         *      pwr_mgt/IOPMLib.h.
-         * Pass this as one filename argument to open_file() rather than
-         * deviding to directory part and file part.  The first argument to
-         * open_file() which is a pointer to the directory part is remembered
-         * by FILEINFO struct.  But, 'fullname' is over-written each time,
-         * and the former path-list is lost soon.  Therefore, it cannot be
-         * passed as the first argument.  In addition, though the first
-         * argument to open_file() is needed for #include_next, this directive
-         * has no meaning in framework.
-         */
-        if ((cp - fullname) + n > PATHMAX)
-            cfatal( "Too long framework path", NULL, 0L, NULL); /* _F_  */
-        if (open_file( &null, NULL, fullname, FALSE, FALSE, sys_frame))
-            return  TRUE;
-    }
-    return  FALSE;
-}
-
-#endif  /* SYSTEM == SYS_MAC    */
-
 #if 0   /* This part is only for debugging  */
 static int  chk_dirp(
     const char **   dirp
@@ -3906,7 +1971,7 @@ void    sharp(
     while (! file->fp)
         file = file->parent;
     line = sharp_file ? sharp_file->line : src_line;
-    if (no_output || option_flags.p || file == NULL
+    if (no_output || file == NULL
             || (file == sh_file && line == sh_line))
         goto  sharp_exit;
     sh_file = file;
@@ -3956,16 +2021,6 @@ static void cur_file(
         sharp_filename = save_string( name);
     }
     mcpp_fprintf( OUT, " \"%s\"", name);
-#if COMPILER == GNUC
-    if (! std_line_prefix) {
-        if (flag) {
-            mcpp_fputc( ' ', OUT);
-            mcpp_fputc( '0' + flag, OUT);
-        }
-        if (file->sys_header)
-            mcpp_fputs( " 3", OUT);
-    }
-#endif
 }
 
 #if SYS_FAMILY == SYS_WIN
@@ -3983,18 +2038,6 @@ static char *   bsl2sl(
     cp = filename;
 
     while (*cp) {
-        if (bsl_in_mbchar) {
-            int     c;
-            c = *cp & UCHARMAX;
-            if (char_type[ c] & mbchk) {    /* First byte of MBCHAR */
-                char    tmp[ PATHMAX];
-                char *  tp = tmp;
-                *tp++ = *cp++;
-                mb_read( c, &cp, &tp);
-                            /* Read over the multi-byte characters  */
-                continue;
-            }
-        }
         if (*cp == '\\') {
             *cp++ = PATH_DELIM;
             if (!diagnosed && (warn_level & 2) && (warn_level != -1)) {
@@ -4073,13 +2116,8 @@ void    do_pragma( void)
     }
     token_type = scan_token( c, (tp = work_buf, &tp), work_end);
 #if EXPAND_PRAGMA
-#if COMPILER == MSC
-    if (token_type == NAM
-            && !str_eq( identifier, "STDC") && !str_eq( identifier, "MCPP")) {
-#else
     if (stdc3 && token_type == NAM
             && !str_eq( identifier, "STDC") && !str_eq( identifier, "MCPP")) {
-#endif
         DEFBUF *        defp;
         char *          mp;
         char *          mp_end;
@@ -4157,80 +2195,7 @@ void    do_pragma( void)
         if (warn && (warn_level & 1))
             cwarn( unknown_arg, identifier, 0L, NULL);
         goto  skip_nl;                  /* Do not putout the line   */
-#if COMPILER == GNUC
-    /* The #pragma lines for GCC is skipped not to confuse cc1.     */
-    } else if (str_eq( identifier, "GCC")) {    /* #pragma GCC *    */
-        if (scan_token( skip_ws(), (tp = work_buf, &tp), work_end) == NAM) {
-            if (str_eq( identifier, "poison")
-                    || str_eq( identifier, "dependency")) {
-                if (warn_level & 2)
-                    cwarn( "Skipped the #pragma line"       /*_W2_  */
-                            , NULL, 0L, NULL);
-                goto skip_nl;
-            } else if (str_eq( identifier, "system_header")) {
-                infile->sys_header = TRUE;      /* Mark as a system header  */
-                goto skip_nl;
-            }
-        }
-#endif
-
-#if COMPILER == MSC
-    } else if (str_eq( identifier, "setlocale")) {
-        if (skip_ws() == '('
-                && scan_token( skip_ws(), (tp = work_buf, &tp), work_end)
-                    == STR
-                && skip_ws() == ')') {
-            if (! is_junk()) {
-                work_buf[ 0] = *(tp - 1) = '\0';
-                set_encoding( work_buf + 1, NULL, SETLOCALE);
-                work_buf[ 0] = *(tp - 1) = '"';
-            }   /* else warned by is_junk() */
-        } else {
-            warn = TRUE;
-        }
-#else   /* COMPILER != MSC  */
-    } else if (str_eq( identifier, "__setlocale")) {
-        if (skip_ws() == '('
-                && scan_token( skip_ws(), (tp = work_buf, &tp), work_end)
-                        == STR
-                && skip_ws() == ')') {
-            if (! is_junk()) {              /* #pragma __setlocale  */
-                work_buf[ 0] = *(tp - 1) = '\0';
-                set_encoding( work_buf + 1, NULL, __SETLOCALE);
-                work_buf[ 0] = *(tp - 1) = '"';
-            }   /* else warned by is_junk() */
-        } else {
-            warn = TRUE;
-        }
-#endif
-
-#if COMPILER == MSC
-    } else if (str_eq( identifier, "push_macro")) {
-        push_or_pop( PUSH);
-        goto  skip_nl;
-    } else if (str_eq( identifier, "pop_macro")) {
-        push_or_pop( POP);
-        goto  skip_nl;
-#endif
-
-#if COMPILER == LCC
-    } else if (str_eq( identifier, "optimize")
-                && (skip_ws() == '(')
-                && (char_type[ (c = skip_ws()) & UCHARMAX] == DIG)
-                && (skip_ws() == ')')) {
-        char    tmp[ 2];
 
-        tmp[ 0] = c;
-        tmp[ 1] = EOS;
-        look_and_install( optim_name, DEF_NOARGS_PREDEF, null, tmp);
-#endif
-
-#if COMPILER == COMPILER_UNKNOWN
-    /*
-     * Write here any compiler-specific #pragma sub-directive which should
-     * be processed by preprocessor.
-     */
-#endif
     }
 
     if (warn) {
@@ -4268,7 +2233,7 @@ static void do_once(
         once_end = &once_list[ max_once];
         max_once *= 2;
     }
-    once_end->name = fullname;
+    once_end->name = (char*)fullname;
     once_end->len = strlen( fullname);
     once_end++;
 }
@@ -4340,8 +2305,7 @@ static void push_or_pop(
                 /* Else the current definition exists.  Push it     */
                 s_def = sizeof (DEFBUF) + 3 + s_name
                         + strlen( defp->repl) + strlen( defp->fname);
-                if (mcpp_mode == STD)
-                    s_def += strlen( defp->parmnames);
+                s_def += strlen( defp->parmnames);
                 dp = (DEFBUF *) xmalloc( s_def);
                 memcpy( dp, defp, s_def);   /* Copy the definition  */
                 dp->link = *prevp;          /* Insert to linked-list*/
@@ -4382,28 +2346,6 @@ static void push_or_pop(
     }
 }
 
-static void do_asm(
-    int     asm_start                       /* #asm ?               */
-)
-/*
- * #asm, #endasm
- * Originally written for OS-9/09 Microware C.
- */
-{
-    if (! compiling)
-        return;
-    if (asm_start == (in_asm != 0L)) {
-        if (in_asm)
-            cerror( "In #asm block started at line %.0s%ld" /* _E_  */
-                    , NULL, in_asm, NULL);
-        else
-            cerror( "Without #asm", NULL, 0L, NULL);        /* _E_  */
-        skip_nl();
-        unget_ch();
-        return;
-    }
-    in_asm = asm_start ? src_line : 0L;
-}
 
 void    do_old( void)
 /*
@@ -4413,91 +2355,9 @@ void    do_old( void)
 {
     static const char * const   unknown
             = "Unknown #directive \"%s\"%.0ld%s";       /* _E_ _W8_ */
-    static const char * const   ext
-            = "%s is not allowed by Standard%.0ld%s";   /* _W2_ _W8_*/
-
-#if COMPILER == GNUC
-    if (str_eq( identifier, "include_next")) {
-        if ((compiling && (warn_level & 2))
-                || (! compiling && (warn_level & 8)))
-            cwarn( ext, "#include_next", 0L
-                    , compiling ? NULL : " (in skipped block)");
-        if (! compiling)
-            return;
-        in_include = TRUE;
-        do_include( TRUE);
-        in_include = FALSE;
-        return;
-    } else if (str_eq( identifier, "warning")) {
-        if ((compiling && (warn_level & 2))
-                || (! compiling && (warn_level & 8)))
-            cwarn( ext, "#warning", 0L
-                    , compiling ? NULL : " (in skipped block)");
-        if (! compiling)
-            return;
-        cwarn( infile->buffer, NULL, 0L, NULL);
-                                    /* Always output the warning    */
-        skip_nl();
-        unget_ch();
-        return;
-    } else if (str_eq( identifier, "ident") || str_eq( identifier, "sccs")) {
-        if ((compiling && (warn_level & 1))
-                || (! compiling && (warn_level & 8))) {
-            if (str_eq( identifier, "ident"))
-                cwarn(
-    compiling ? "Ignored #ident" : "#ident (in skipped block)"  /* _W1_ _W8_*/
-                        , NULL, 0L, NULL);
-            else
-                cwarn(
-    compiling ? "Ignored #sccs" : "#sccs (in skipped block)"    /* _W1_ _W8_*/
-                        , NULL, 0L, NULL);
-        }
-        if (! compiling)
-            return;
-        skip_nl();
-        unget_ch();
-        return;
-    }
-#endif  /* COMPILER == GNUC */
-
-#if COMPILER == MSC
-    if (str_eq( identifier, "using") || str_eq( identifier, "import")) {
-                                            /* #using or #import    */
-        if (! compiling)
-            return;
-        mcpp_fputs( infile->buffer, OUT);   /* Putout the line as is*/
-        skip_nl();
-        unget_ch();
-        return;
-    }
-#endif
-
-#if SYSTEM == SYS_MAC
-    if (str_eq( identifier, "import")) {
-        if ((compiling && (warn_level & 2))
-                || (! compiling && (warn_level & 8)))
-            cwarn( ext, "#import", 0L
-                    , compiling ? NULL : " (in skipped block)");
-        if (! compiling)
-            return;
-        in_import = in_include = TRUE;
-        do_include( FALSE);
-        in_import = in_include = FALSE;
-        return;
-    }
-#endif
-
-    if (! standard && do_prestd_directive())
-        return;
 
     if (compiling) {
-        if (option_flags.lang_asm) {        /* "Assembler" source   */
-            if (warn_level & 1)
-                cwarn( unknown, identifier, 0L, NULL);
-            mcpp_fputs( infile->buffer, OUT);   /* Putout the line  */
-        } else {
-            cerror( unknown, identifier, 0L, NULL);
-        }
+        cerror( unknown, identifier, 0L, NULL);
     } else if (warn_level & 8) {
         cwarn( unknown, identifier, 0L, " (in skipped block)");
     }
@@ -4506,80 +2366,6 @@ void    do_old( void)
     return;
 }
 
-static int  do_prestd_directive( void)
-/*
- * Process directives for pre-Standard mode.
- */
-{
-#if COMPILER != GNUC
-    if (str_eq( identifier, "assert")) {    /* #assert              */
-        if (! compiling)                    /* Only validity check  */
-            return  TRUE;
-        if (eval_if() == 0L) {              /* Assert expression    */
-            cerror( "Preprocessing assertion failed"        /* _E_  */
-                    , NULL, 0L, NULL);
-            skip_nl();
-            unget_ch();
-        }
-        return  TRUE;
-    } else
-#endif
-    if (str_eq( identifier, "put_defines")) {
-        if (! compiling)                    /* Only validity check  */
-            return  TRUE;
-        if (mcpp_mode != OLD_PREP && ! is_junk())
-            dump_def( TRUE, FALSE);         /* #put_defines         */
-        skip_nl();
-        unget_ch();
-        return  TRUE;
-    } else if (str_eq( identifier, "preprocess")) {
-        if (! compiling)                    /* Only validity check  */
-            return  TRUE;
-        if (mcpp_mode != OLD_PREP && ! is_junk())
-        /* Just putout the directive for the succeding preprocessor */
-            mcpp_fputs( "#preprocessed\n", OUT);
-        skip_nl();
-        unget_ch();
-        return  TRUE;
-    } else if (str_eq( identifier, "preprocessed")) {
-        if (! compiling)                    /* Only validity check  */
-            return  TRUE;
-        if (mcpp_mode != OLD_PREP && ! is_junk()) {
-            skip_nl();
-            do_preprocessed();              /* #preprocessed        */
-            return  TRUE;
-        }
-        skip_nl();
-        unget_ch();
-        return  TRUE;
-    }
-
-    if (str_eq( identifier, "debug")) {     /* #debug <args>        */
-        if (! compiling)                    /* Only validity check  */
-            return  TRUE;
-        do_debug( TRUE);
-        return  TRUE;
-    } else if (str_eq( identifier, "end_debug")) {
-        if (! compiling)
-            return  TRUE;
-        do_debug( FALSE);                   /* #end_debug <args>    */
-        return  TRUE;
-    }
-
-    if (str_eq( identifier, "asm")) {       /* #asm                 */
-        do_asm( TRUE);
-        return  TRUE;
-    }
-    if (str_eq( identifier, "endasm")) {    /* #endasm              */
-        do_asm( FALSE);
-        skip_nl();                          /* Skip comments, etc.  */
-        unget_ch();
-        return  TRUE;
-    }
-
-    return  FALSE;                          /* Unknown directive    */
-}
-
 static void do_preprocessed( void)
 /*
  * The source file has been already preprocessed.
@@ -4731,14 +2517,15 @@ static int  do_debug(
                 else if (num == MEMORY)
                     print_heap();
                 else if (num == MACRO_CALL)
-                    option_flags.k = TRUE;  /* This pragma needs this mode  */
+                    // option_flags.k = TRUE;  /* This pragma needs this mode  */
+                    ;
             } else {
                 mcpp_debug &= ~num;
             }
         }
         c = skip_ws();
     }
-    if ((mcpp_mode != STD && (mcpp_debug & MACRO_CALL)) || c != '\n') {
+    if (c != '\n') {
         if (warn_level & 1) {
             if (c != '\n') {
                 cwarn( not_ident, work_buf, 0L, NULL);
@@ -4757,18 +2544,6 @@ diagnosed:
     return TRUE;
 }
 
-void    put_asm( void)
-/*
- * Put out source line as it is.
- */
-{
-#if 0
-    mcpp_fputs( "#2\n", OUT);
-    mcpp_fputs( infile->buffer, OUT);
-    skip_nl();
-#endif
-}
-
 static void dump_path( void)
 /*
  * Show the include directories.
@@ -4777,7 +2552,6 @@ static void dump_path( void)
     const char **   incptr;
     const char *    inc_dir;
     const char *    dir = "./";
-    int             i;
 
     mcpp_fputs( "Include paths are as follows --\n", DBG);
     for (incptr = incdir; incptr < incend; incptr++) {
@@ -4787,12 +2561,6 @@ static void dump_path( void)
         mcpp_fprintf( DBG, "    %s\n", inc_dir);
     }
     mcpp_fputs( "End of include path list.\n", DBG);
-#if SYSTEM == SYS_MAC
-    mcpp_fputs( "Framework paths are as follows --\n", DBG);
-    for (i = 0; i < num_framework; i++ )
-        mcpp_fprintf( DBG, "    %s\n", framework[ i]);
-    mcpp_fputs( "End of framework path list.\n", DBG);
-#endif
 }
 
 /*
@@ -4912,13 +2680,8 @@ void    at_end( void)
  * Handle the commands to be executed at the end of processing.
  */
 {
-#if COMPILER == GNUC
-    if (dMflag || dDflag)
-        dump_def( FALSE, FALSE);
-#endif
 }
 
-#if MCPP_LIB
 void    clear_filelist( void)
 /*
  * Free malloced memory for filename-list and directory-list.
@@ -4933,8 +2696,5 @@ void    clear_filelist( void)
     for (namep = fnamelist; namep < fname_end; namep++)
         free( (void *) namep->name);
     free( (void *) fnamelist);
-    if (standard)
-        free( (void *) once_list);
+    free( (void *) once_list);
 }
-#endif
-