JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#undef flock (LP: #912691)

Browse Source
This commit is contained in:
tg
2012-03-27 22:41:17 +00:00
parent 95a2c63096
commit 340cd95cf0
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sh.h
View File

@@ -152,7 +152,7 @@
#endif
#ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.531 2012/03/27 22:36:53 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.532 2012/03/27 22:41:17 tg Exp $");
#endif
#define MKSH_VERSION "R40 2012/03/27"
@@ -204,6 +204,12 @@ typedef unsigned long rlim_t;
typedef void (*sig_t)(int);
#endif
/* un-do vendor damage */
#undef BAD /* AIX defines that somewhere */
#undef flock /* SCO UnixWare defines that to flock64 but ENOENT */
#ifndef MKSH_INCLUDES_ONLY
/* extra types */
@@ -296,7 +302,6 @@ struct rusage {
#endif
#endif
#undef BAD /* AIX defines that somewhere */
/* OS-dependent additions (functions, variables, by OS) */