mirror of git://git.gnupg.org/gnupg.git
* idea-stub.c, random.c; s/__MINGW32__/_WIN32/ to help building on native
Windows compilers. Requested by Brian Gladman. From Werner on stable branch.
This commit is contained in:
parent
1814e2dbf3
commit
6eb9d6297f
|
@ -1,3 +1,9 @@
|
||||||
|
2003-08-28 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* idea-stub.c, random.c; s/__MINGW32__/_WIN32/ to help building on
|
||||||
|
native Windows compilers. Requested by Brian Gladman. From
|
||||||
|
Werner on stable branch.
|
||||||
|
|
||||||
2003-08-21 David Shaw <dshaw@jabberwocky.com>
|
2003-08-21 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* random.c (getfnc_gather_random): Don't check NAME_OF_DEV_RANDOM
|
* random.c (getfnc_gather_random): Don't check NAME_OF_DEV_RANDOM
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* idea-stub.c - Dummy module for the deprecated IDEA cipher.
|
/* idea-stub.c - Dummy module for the deprecated IDEA cipher.
|
||||||
* Copyright (C) 2002 Free Software Foundation, Inc.
|
* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GnuPG.
|
* This file is part of GnuPG.
|
||||||
*
|
*
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
#ifdef HAVE_DL_DLOPEN
|
#ifdef HAVE_DL_DLOPEN
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __MINGW32__
|
#ifdef _WIN32
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#endif
|
#endif
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
@ -52,7 +52,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef _WIN32
|
||||||
#define HAVE_DL_DLOPEN
|
#define HAVE_DL_DLOPEN
|
||||||
#define USE_DYNAMIC_LINKING
|
#define USE_DYNAMIC_LINKING
|
||||||
|
|
||||||
|
@ -101,7 +101,7 @@ dlsym ( void *handle, const char *name )
|
||||||
}
|
}
|
||||||
return h;
|
return h;
|
||||||
}
|
}
|
||||||
#endif /*__MINGW32__*/
|
#endif /*_WIN32*/
|
||||||
|
|
||||||
/* We do only support dlopen and the Windows emulation of it. */
|
/* We do only support dlopen and the Windows emulation of it. */
|
||||||
#ifndef HAVE_DL_DLOPEN
|
#ifndef HAVE_DL_DLOPEN
|
||||||
|
@ -117,7 +117,7 @@ load_module (const char *name)
|
||||||
void *handle;
|
void *handle;
|
||||||
void *sym;
|
void *sym;
|
||||||
|
|
||||||
#ifndef __MINGW32__
|
#ifndef _WIN32
|
||||||
/* Make sure we are not setuid. */
|
/* Make sure we are not setuid. */
|
||||||
if (getuid() != geteuid())
|
if (getuid() != geteuid())
|
||||||
log_bug("trying to load an extension while still setuid\n");
|
log_bug("trying to load an extension while still setuid\n");
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/* random.c - random number generator
|
/* random.c - random number generator
|
||||||
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
* Copyright (C) 1998, 1999, 2000, 2001, 2002,
|
||||||
|
* 2003 Free Software Foundation, Inc.
|
||||||
*
|
*
|
||||||
* This file is part of GnuPG.
|
* This file is part of GnuPG.
|
||||||
*
|
*
|
||||||
|
@ -33,7 +34,9 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#ifndef _WIN32
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
#endif
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
@ -50,7 +53,7 @@
|
||||||
#ifdef HAVE_GETRUSAGE
|
#ifdef HAVE_GETRUSAGE
|
||||||
#include <sys/resource.h>
|
#include <sys/resource.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef __MINGW32__
|
#ifdef _WIN32
|
||||||
#include <process.h>
|
#include <process.h>
|
||||||
#endif
|
#endif
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
Loading…
Reference in New Issue