Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/posix/include/posix/getopt.h

    ra0a9cc2 r2b3dd78  
    3535#define POSIX_GETOPT_H
    3636
    37 #ifndef __POSIX_DEF__
    38 #define __POSIX_DEF__(x) x
    39 #endif
    40 
    4137#include "unistd.h"
    42 
    43 /* Option Arguments */
    44 #define no_argument        0
    45 #define required_argument  1
    46 #define optional_argument  2
    47 
    48 #ifndef LIBPOSIX_INTERNAL
    49 struct option {
    50         const char *name;
    51         int has_arg;
    52         int *flag;
    53         int val;
    54 };
    55 #endif
    56 
    57 extern int __POSIX_DEF__(getopt_long)(int, char * const [], const char *, const struct option *, int *);
    58 
     38#include "libc/getopt.h"
    5939
    6040#endif
Note: See TracChangeset for help on using the changeset viewer.