Permalink
Browse files

Remove some things from confmagic.h

  • Loading branch information...
shawnw committed Sep 13, 2016
1 parent f6bcae2 commit 6895992a7d5b220b04f76c14d33777aa82030f01
Showing with 7 additions and 28 deletions.
  1. +2 −0 config.h.in
  2. +1 −1 configure
  3. +1 −1 configure.in
  4. +0 −18 confmagic.h
  5. +3 −8 src/player.c
View
@@ -55,6 +55,8 @@
#undef HAVE_LANGINFO_H
#undef HAVE_CRYPT_H
/* C99ish headers. The first two are really really nice to have. */
#undef HAVE_STDINT_H
View
@@ -5500,7 +5500,7 @@ fi
done
for ac_header in poll.h sys/select.h sys/inotify.h langinfo.h
for ac_header in poll.h sys/select.h sys/inotify.h langinfo.h crypt.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
View
@@ -157,7 +157,7 @@ AC_HEADER_TIME
AC_CHECK_HEADERS([sys/stat.h sys/time.h sys/types.h])
AC_CHECK_HEADERS([sys/socket.h arpa/inet.h libintl.h netdb.h netinet/tcp.h netinet/in.h])
AC_CHECK_HEADERS([sys/un.h sys/resource.h sys/event.h sys/uio.h byteswap.h])
AC_CHECK_HEADERS([poll.h sys/select.h sys/inotify.h langinfo.h])
AC_CHECK_HEADERS([poll.h sys/select.h sys/inotify.h langinfo.h crypt.h])
AC_CHECK_HEADERS([zlib.h event2/event.h event2/dns.h fenv.h sys/param.h])
AC_CHECK_HEADERS([sys/ucred.h], [], [], [
AC_INCLUDES_DEFAULT
View
@@ -12,18 +12,6 @@
#ifndef _confmagic_h_
#define _confmagic_h_
/*
* (which isn't exportable from the U.S.), then don't encrypt
*/
#ifndef HAVE_CRYPT
#define crypt(s,t) (s)
#endif
#ifndef HAVE_STRCOLL
#undef strcoll
#define strcoll strcmp
#endif
#ifndef HAVE_SNPRINTF
#ifdef HAVE__VSNPRINTF_S
#define snprintf sane_snprintf_s
@@ -45,10 +33,4 @@ int sane_snprintf_s(char *, size_t, const char *, ...);
#endif
#endif
#if defined(HAVE_POLLTS) && !defined(HAVE_PPOLL)
/* Linux's ppoll() is identical to NetBSD's pollts() in all but name. */
#define ppoll pollts
#define HAVE_PPOLL
#endif
#endif
View
@@ -26,6 +26,9 @@
#include <sys/types.h>
#endif
#include <fcntl.h>
#ifdef HAVE_CRYPT_H
#include <crypt.h>
#endif
#include "access.h"
#include "attrib.h"
@@ -42,14 +45,6 @@
#include "parse.h"
#include "strutil.h"
#ifdef HAVE_CRYPT
#ifdef I_CRYPT
#include <crypt.h>
#else
extern char *crypt(const char *, const char *);
#endif
#endif
/* From mycrypt.c */
char *mush_crypt_sha0(const char *key);
char *password_hash(const char *key, const char *algo);

0 comments on commit 6895992

Please sign in to comment.