diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 18:09:34 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-10-31 18:09:34 +0000 |
| commit | b860331aa1bb8b68d65512af073ff9a52d0f04f8 (patch) | |
| tree | 536684b5953e83a476f0351579c2ef988f8b5d26 /app/smproxy/save.c | |
| parent | cd7afc28c3e705ad765cf00059c466bb18f4fdf6 (diff) | |
Update to smproxy 1.0.4. No functional change.
Diffstat (limited to 'app/smproxy/save.c')
| -rw-r--r-- | app/smproxy/save.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/app/smproxy/save.c b/app/smproxy/save.c index 8510f1e60..4bf3663e8 100644 --- a/app/smproxy/save.c +++ b/app/smproxy/save.c @@ -1,4 +1,3 @@ -/* $Xorg: save.c,v 1.4 2001/02/09 02:05:35 xorgcvs Exp $ */ /****************************************************************************** Copyright 1994, 1998 The Open Group @@ -25,10 +24,9 @@ in this Software without prior written authorization from The Open Group. Author: Ralph Mor, X Consortium ******************************************************************************/ -/* $XFree86: xc/programs/smproxy/save.c,v 1.7 2001/01/17 23:45:04 dawes Exp $ */ #include "smproxy.h" -#ifdef HAS_MKSTEMP +#ifdef HAVE_MKSTEMP #include <unistd.h> #endif @@ -41,7 +39,7 @@ static int write_counted_string ( FILE *file, char *string ); static int read_byte ( FILE *file, unsigned char *bp ); static int read_short ( FILE *file, unsigned short *shortp ); static int read_counted_string ( FILE *file, char **stringp ); -#ifndef HAS_MKSTEMP +#ifndef HAVE_MKSTEMP static char * unique_filename ( char *path, char *prefix ); #else static char * unique_filename ( char *path, char *prefix, int *pFd ); @@ -301,7 +299,7 @@ ReadProxyFile(char *filename) -#ifndef HAS_MKSTEMP +#ifndef HAVE_MKSTEMP static char * unique_filename(char *path, char *prefix) #else @@ -309,7 +307,7 @@ static char * unique_filename(char *path, char *prefix, int *pFd) #endif { -#ifndef HAS_MKSTEMP +#ifndef HAVE_MKSTEMP #ifndef X_NOT_POSIX return ((char *) tempnam (path, prefix)); #else @@ -349,7 +347,7 @@ WriteProxyFile(void) { FILE *proxyFile = NULL; char *filename = NULL; -#ifdef HAS_MKSTEMP +#ifdef HAVE_MKSTEMP int fd; #endif char *path; @@ -364,7 +362,7 @@ WriteProxyFile(void) path = "."; } -#ifndef HAS_MKSTEMP +#ifndef HAVE_MKSTEMP if ((filename = unique_filename (path, ".prx")) == NULL) goto bad; |