Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-21 12:27:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

* xrdb.c: Don't include <X11/Xos.h>. Under R4, it stupidly

Browse source 
insists on defining SIGCHLD, even if it already has a definition.
	(file_p): Use the constant 4 instead of R_OK; empirically, the
	number is more portable than the symbol if you count the #include
	hair you have to go through to get R_OK defined.  Ffile_readable_p
	does this too.

	* xrdb.c (getuid): Declare this to return short.
This commit is contained in:
Jim Blandy 1992-09-13 12:48:38 +00:00
parent 252500313b
commit dfc35f5fca
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xrdb.c
View file

@ -32,7 +32,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#if 0
#include <X11/Xos.h>
#endif
#include <X11/X.h>
#include <X11/Xutil.h>
#include <X11/Xresource.h>
@ -49,7 +51,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#endif
extern char *getenv ();
extern int getuid ();
extern short getuid (); /* If this causes portability problems,
I think we should just delete it; it'll
default to `int' anyway. */
extern struct passwd *getpwuid ();
extern struct passwd *getpwnam ();
@ -96,7 +100,7 @@ file_p (path)
{
struct stat status;
return (access (path, R_OK) == 0 /* exists and is readable */
return (access (path, 4) == 0 /* exists and is readable */
&& stat (path, &status) == 0 /* get the status */
&& (status.st_mode & S_IFDIR) == 0); /* not a directory */
}