Changeset 7ed1d8f


Ignore:
Timestamp:
Aug 11, 2020, 2:22:16 PM (15 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
7f6e9eb
Parents:
be36ec3 (diff), e699eb6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
libcfa/src
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.am

    rbe36ec3 r7ed1d8f  
    4444
    4545headers = common.hfa fstream.hfa heap.hfa iostream.hfa iterator.hfa limits.hfa rational.hfa \
    46                 time.hfa stdlib.hfa memory.hfa \
     46                time.hfa stdlib.hfa memory.hfa parseargs.hfa \
    4747                containers/maybe.hfa containers/pair.hfa containers/result.hfa containers/vector.hfa
    4848
  • libcfa/src/parseargs.cfa

    rbe36ec3 r7ed1d8f  
    11#include "parseargs.hfa"
    22
    3 // #include <stdio.h>
    4 // #include <stdlib.h>
     3#include <stdint.h>
     4#include <string.h>
    55#include <errno.h>
    6 #include <string.h>
    76#include <unistd.h>
    87extern "C" {
     
    2221}
    2322
    24 #include <common.hfa>
    25 #include <limits.hfa>
     23#include "common.hfa"
     24#include "limits.hfa"
    2625
    2726void printopt(FILE * out, int width, int max, char sn, const char * ln, const char * help) {
     
    6766                        }
    6867                }
    69                 optarr[idx+0].[name, has_arg, flag, val] = ["help", no_argument, 0p, 'h'];
    70                 optarr[idx+1].[name, has_arg, flag, val] = [0p, no_argument, 0p, 0];
     68                optarr[idx+0].[name, has_arg, flag, val] = ["help", no_argument, 0, 'h'];
     69                optarr[idx+1].[name, has_arg, flag, val] = [0, no_argument, 0, 0];
    7170        }
    7271
Note: See TracChangeset for help on using the changeset viewer.