Changeset 0427ff6

Timestamp:

01/18/12 11:35:34 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

49b5292415176d90e4bdb5de8c341ce105064e4b

Parents:

b7bc0715571aa50ce515bf30d0ccf4a8830b1a6d

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-18 11:35:28+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-18 11:35:34+01:00

Message:

These functions seems to conflict with Windows of some reason. We don't need
them anyway

File:

• telldus-core/3rdparty/openbsd-getopt/unistd.h (modified) (4 diffs)

telldus-core/3rdparty/openbsd-getopt/unistd.h

@@ -67 +67 @@
 
 __BEGIN_DECLS
-__dead void      _exit(int);
-int      access(const char *, int);
+//__dead void    _exit(int);
+//int    access(const char *, int);
 unsigned int alarm(unsigned int);
-int      chdir(const char *);
-int      chown(const char *, uid_t, gid_t);
+//int    chdir(const char *);
+//int    chown(const char *, uid_t, gid_t);
 int      close(int);
 int      dup(int);
 int      dup2(int, int);
-int      execl(const char *, const char *, ...) 
-            __attribute__((sentinel));
-int      execle(const char *, const char *, ...);
-int      execlp(const char *, const char *, ...) 
-            __attribute__((sentinel));
-int      execv(const char *, char * const *);
-int      execve(const char *, char * const *, char * const *);
-int      execvp(const char *, char * const *);
+//int    execl(const char *, const char *, ...)
+//          __attribute__((sentinel));
+//int    execle(const char *, const char *, ...);
+//int    execlp(const char *, const char *, ...)
+//          __attribute__((sentinel));
+//int    execv(const char *, char * const *);
+//int    execve(const char *, char * const *, char * const *);
+//int    execvp(const char *, char * const *);
 pid_t    fork(void);
 long     fpathconf(int, int);
@@ -97 +97 @@
 uid_t    getuid(void);
 int      isatty(int);
-int      link(const char *, const char *);
-off_t    lseek(int, off_t, int);
-long     pathconf(const char *, int);
+//int    link(const char *, const char *);
+//off_t  lseek(int, off_t, int);
+//long   pathconf(const char *, int);
 int      pause(void);
 int      pipe(int *);
-ssize_t  read(int, void *, size_t)
-                __attribute__((__bounded__(__buffer__,2,3)));
-int      rmdir(const char *);
+//ssize_t        read(int, void *, size_t)
+//              __attribute__((__bounded__(__buffer__,2,3)));
+//int    rmdir(const char *);
 int      setgid(gid_t);
 int      setuid(uid_t);
@@ -112 +112 @@
 int      tcsetpgrp(int, pid_t);
 char    *ttyname(int);
-int      unlink(const char *);
-ssize_t  write(int, const void *, size_t)
-                __attribute__((__bounded__(__buffer__,2,3)));
+//int    unlink(const char *);
+//ssize_t        write(int, const void *, size_t)
+//              __attribute__((__bounded__(__buffer__,2,3)));
 
 #if __POSIX_VISIBLE || __XPG_VISIBLE >= 300
@@ -183 +183 @@
 /* Interfaces withdrawn by X/Open Issue 5 Version 0 */
 int      brk(void *);
-int      chroot(const char *);
+//int    chroot(const char *);
 int      getdtablesize(void);
 int      getpagesize(void);
-char    *getpass(const char *);
+//char  *getpass(const char *);
 void    *sbrk(int);
 #endif