projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #5675 from mono/glib-debug-symbols
[mono.git]
/
support
/
macros.c
diff --git
a/support/macros.c
b/support/macros.c
index a26864bf483ba1d0abb54716d49f14c9592483c3..8d455889d7ca4c30ea10c8a6e7c2471afcec7179 100644
(file)
--- a/
support/macros.c
+++ b/
support/macros.c
@@
-1,3
+1,4
@@
+#include "mph.h"
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>
@@
-8,6
+9,7
@@
#include <dirent.h>
#include <string.h>
#include <glib.h>
#include <dirent.h>
#include <string.h>
#include <glib.h>
+#include "map.h"
int wifexited (int status)
{
int wifexited (int status)
{
@@
-39,7
+41,7
@@
int wstopsig (int status)
return WSTOPSIG (status);
}
return WSTOPSIG (status);
}
-int helper_Mono_Posix_Stat(char *filename, int dereference,
+int helper_Mono_Posix_Stat(c
onst c
har *filename, int dereference,
int *device,
int *inode,
int *mode,
int *device,
int *inode,
int *mode,
@@
-91,12
+93,22
@@
char *helper_Mono_Posix_GetGroupName(int gid) {
return strdup (p->gr_name);
}
return strdup (p->gr_name);
}
-char *helper_Mono_Posix_readdir(
DIR
*dir) {
- struct dirent* e = readdir(dir);
+char *helper_Mono_Posix_readdir(
void
*dir) {
+ struct dirent* e = readdir(
(DIR*)
dir);
if (e == NULL) return NULL;
return strdup (e->d_name);
}
if (e == NULL) return NULL;
return strdup (e->d_name);
}
+#if HAVE_GETPWNAM_R
+int helper_Mono_Posix_getpwnamuid (int mode, char *in_name, int in_uid,
+ char **account,
+ char **password,
+ int *uid,
+ int *gid,
+ char **name,
+ char **home,
+ char **shell);
+
int helper_Mono_Posix_getpwnamuid (int mode, char *in_name, int in_uid,
char **account,
char **password,
int helper_Mono_Posix_getpwnamuid (int mode, char *in_name, int in_uid,
char **account,
char **password,
@@
-143,3
+155,5
@@
int helper_Mono_Posix_getpwnamuid (int mode, char *in_name, int in_uid,
return 0;
}
return 0;
}
+#endif /* def HAVE_GETPWNAM_R */
+