Commit d6f8f160 authored by Yang Tse's avatar Yang Tse
Browse files

fix: preprocessor complaining about macro redefinition

parent 466429ef

lib/nss.c

+0 −4
Original line number Diff line number Diff line
@@ -66,10 +66,6 @@ 
/* The last #include file should be: */

#include "memdebug.h"



#ifndef min

#define min(a, b)   ((a) < (b) ? (a) : (b))

#endif



#define SSL_DIR "/etc/pki/nssdb"



/* enough to fit the string "PEM Token #[0|1]" */

lib/security.c

+3 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 * Copyright (c) 1998, 1999 Kungliga Tekniska Hgskolan

 * (Royal Institute of Technology, Stockholm, Sweden).

 *

 * Copyright (C) 2001 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 2001 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * All rights reserved.

 *
@@ -70,8 +70,6 @@ 
/* The last #include file should be: */

#include "memdebug.h"



#define min(a, b)   ((a) < (b) ? (a) : (b))



static const struct {

  enum protection_level level;

  const char *name;
@@ -179,7 +177,8 @@ sec_get_data(struct connectdata *conn, 
static size_t

buffer_read(struct krb4buffer *buf, void *data, size_t len)

{

  len = min(len, buf->size - buf->index);

  if(buf->size - buf->index < len)

    len = buf->size - buf->index;

  memcpy(data, (char*)buf->data + buf->index, len);

  buf->index += len;

  return len;

lib/ssluse.c

+0 −4
Original line number Diff line number Diff line
@@ -70,10 +70,6 @@ 
/* The last #include file should be: */

#include "memdebug.h"



#ifndef min

#define min(a, b)   ((a) < (b) ? (a) : (b))

#endif



#if OPENSSL_VERSION_NUMBER >= 0x0090581fL

#define HAVE_SSL_GET1_SESSION 1

#else