Changeset 6843a9c in mainline for uspace/lib/posix/unistd.h


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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 mainline changes

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/posix/unistd.h

    rba72f2b r6843a9c  
    4343#define _exit exit
    4444
    45 /* Option Arguments */
    46 extern char *optarg;
     45extern char *posix_optarg;
    4746extern int optind, opterr, optopt;
    48 extern int getopt(int, char * const [], const char *);
     47extern int posix_getopt(int, char * const [], const char *);
    4948
    5049/* Environment */
    … …  
    144143
    145144#ifndef LIBPOSIX_INTERNAL
     145        #define getopt posix_getopt
     146        #define optarg posix_optarg
     147
    146148        #define environ posix_environ
    147149
Note: See TracChangeset for help on using the changeset viewer.