expand_number() needs uint64_t, declare it here if not already declared.

[pw-darwin.git] / libutil / libutil.h

diff --git a/libutil/libutil.h b/libutil/libutil.h
index 3a05d9b56f69e8dcfc5530bc9c19197df1671103..66104e974f131d684b4ab31012d808b5839486f0 100644 (file)
--- a/libutil/libutil.h
+++ b/libutil/libutil.h
@@ -39,6 +39,39 @@
 #ifndef _LIBUTIL_H_
 #define        _LIBUTIL_H_
 
 #ifndef _LIBUTIL_H_
 #define        _LIBUTIL_H_
 

+#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+#ifndef _GID_T_DECLARED
+typedef        __gid_t         gid_t;
+#define        _GID_T_DECLARED
+#endif
+
+#ifndef _INT64_T_DECLARED
+typedef        __int64_t       int64_t;
+#define        _INT64_T_DECLARED
+#endif
+
+#ifndef _UINT64_T_DECLARED
+typedef        __uint64_t      uint64_t;
+#define        _UINT64_T_DECLARED
+#endif
+
+#ifndef _PID_T_DECLARED
+typedef        __pid_t         pid_t;
+#define        _PID_T_DECLARED
+#endif
+
+#ifndef _SIZE_T_DECLARED
+typedef        __size_t        size_t;
+#define        _SIZE_T_DECLARED
+#endif
+
+#ifndef _UID_T_DECLARED
+typedef        __uid_t         uid_t;
+#define        _UID_T_DECLARED
+#endif
+

 #define PROPERTY_MAX_NAME      64
 #define PROPERTY_MAX_VALUE     512
 
 #define PROPERTY_MAX_NAME      64
 #define PROPERTY_MAX_VALUE     512
 


@@ -62,7 +95,6 @@ struct pidfh {
 /* Avoid pulling in all the include files for no need */
 struct termios;
 struct winsize;
 /* Avoid pulling in all the include files for no need */
 struct termios;
 struct winsize;

-struct utmp;

 struct in_addr;
 struct kinfo_file;
 struct kinfo_vmentry;
 struct in_addr;
 struct kinfo_file;
 struct kinfo_vmentry;


@@ -74,10 +106,7 @@ int extattr_namespace_to_string(int _attrnamespace, char **_string);
 int    extattr_string_to_namespace(const char *_string, int *_attrnamespace);
 int    flopen(const char *_path, int _flags, ...);
 void   hexdump(const void *ptr, int length, const char *hdr, int flags);
 int    extattr_string_to_namespace(const char *_string, int *_attrnamespace);
 int    flopen(const char *_path, int _flags, ...);
 void   hexdump(const void *ptr, int length, const char *hdr, int flags);

-void   login(struct utmp *_ut);

 int    login_tty(int _fd);
 int    login_tty(int _fd);

-int    logout(const char *_line);
-void   logwtmp(const char *_line, const char *_name, const char *_host);

 void   trimdomain(char *_fullhost, int _hostsize);
 int    openpty(int *_amaster, int *_aslave, char *_name,
                     struct termios *_termp, struct winsize *_winp);
 void   trimdomain(char *_fullhost, int _hostsize);
 int    openpty(int *_amaster, int *_aslave, char *_name,
                     struct termios *_termp, struct winsize *_winp);


@@ -85,7 +114,7 @@ int  forkpty(int *_amaster, char *_name,
                     struct termios *_termp, struct winsize *_winp);
 int    humanize_number(char *_buf, size_t _len, int64_t _number,
            const char *_suffix, int _scale, int _flags);
                     struct termios *_termp, struct winsize *_winp);
 int    humanize_number(char *_buf, size_t _len, int64_t _number,
            const char *_suffix, int _scale, int _flags);

-int    expand_number(const char *_buf, int64_t *_num);
+int    expand_number(const char *_buf, uint64_t *_num);

 const char *uu_lockerr(int _uu_lockresult);
 int    uu_lock(const char *_ttyname);
 int    uu_unlock(const char *_ttyname);
 const char *uu_lockerr(int _uu_lockresult);
 int    uu_lock(const char *_ttyname);
 int    uu_unlock(const char *_ttyname);


@@ -154,6 +183,7 @@ int quota_check_path(const struct quotafile *, const char *path);
 int quota_read(struct quotafile *, struct dqblk *, int);
 int quota_write_limits(struct quotafile *, struct dqblk *, int);
 int quota_write_usage(struct quotafile *, struct dqblk *, int);
 int quota_read(struct quotafile *, struct dqblk *, int);
 int quota_write_limits(struct quotafile *, struct dqblk *, int);
 int quota_write_usage(struct quotafile *, struct dqblk *, int);

+int quota_convert(struct quotafile *, int);

 #endif
 
 __END_DECLS
 #endif
 
 __END_DECLS