Changeset 8b863a62 in mainline for uspace/lib/posix/include/posix/pwd.h

Timestamp:

2014-04-16T17:14:06Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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

File:

• uspace/lib/posix/include/posix/pwd.h (modified) (1 diff)

uspace/lib/posix/include/posix/pwd.h

@@ -36 +36 @@
 #define POSIX_PWD_H_
 
+#ifndef __POSIX_DEF__
+#define __POSIX_DEF__(x) x
+#endif
+
 #include "sys/types.h"
 
-struct posix_passwd {
+struct __POSIX_DEF__(passwd) {
         char *pw_name;
-        posix_uid_t pw_uid;
-        posix_gid_t pw_gid;
+        __POSIX_DEF__(uid_t) pw_uid;
+        __POSIX_DEF__(gid_t) pw_gid;
         char *pw_dir;
         char *pw_shell;
 };
 
-extern struct posix_passwd *posix_getpwent(void);
-extern void posix_setpwent(void);
-extern void posix_endpwent(void);
+extern struct __POSIX_DEF__(passwd) *__POSIX_DEF__(getpwent)(void);
+extern void __POSIX_DEF__(setpwent)(void);
+extern void __POSIX_DEF__(endpwent)(void);
 
-extern struct posix_passwd *posix_getpwnam(const char *name);
-extern int posix_getpwnam_r(const char *name, struct posix_passwd *pwd,
-    char *buffer, size_t bufsize, struct posix_passwd **result);
+extern struct __POSIX_DEF__(passwd) *__POSIX_DEF__(getpwnam)(const char *name);
+extern int __POSIX_DEF__(getpwnam_r)(const char *name, struct __POSIX_DEF__(passwd) *pwd,
+    char *buffer, size_t bufsize, struct __POSIX_DEF__(passwd) **result);
 
-extern struct posix_passwd *posix_getpwuid(posix_uid_t uid);
-extern int posix_getpwuid_r(posix_uid_t uid, struct posix_passwd *pwd,
-    char *buffer, size_t bufsize, struct posix_passwd **result);
+extern struct __POSIX_DEF__(passwd) *__POSIX_DEF__(getpwuid)(__POSIX_DEF__(uid_t) uid);
+extern int __POSIX_DEF__(getpwuid_r)(__POSIX_DEF__(uid_t) uid, struct __POSIX_DEF__(passwd) *pwd,
+    char *buffer, size_t bufsize, struct __POSIX_DEF__(passwd) **result);
 
-#ifndef LIBPOSIX_INTERNAL
-        #define passwd posix_passwd
-        
-        #define getpwent posix_getpwent
-        #define setpwent posix_setpwent
-        #define endpwent posix_endpwent
-
-        #define getpwnam posix_getpwnam
-        #define getpwnam_r posix_getpwnam_r
-
-        #define getpwuid posix_getpwuid
-        #define getpwuid_r posix_getpwuid_r
-#endif
 
 #endif /* POSIX_PWD_H_ */