White spaces.
(cherry picked from commit d6418b3e17d0241cdaa4af73355bb93e50c5acf1)
This commit is contained in:
parent
59c70e2a0e
commit
dd75baab6b
@ -1,24 +1,19 @@
|
||||
|
||||
|
||||
#ifndef UPNPGLOBAL_H
|
||||
#define UPNPGLOBAL_H
|
||||
|
||||
|
||||
/*!
|
||||
* \file
|
||||
*
|
||||
* \brief Defines constants that for some reason are not defined on some systems.
|
||||
*/
|
||||
|
||||
|
||||
#if defined MYLIB_LARGEFILE_SENSITIVE && _FILE_OFFSET_BITS+0 != 64
|
||||
#if defined __GNUC__
|
||||
#warning libupnp requires largefile mode - use AC_SYS_LARGEFILE
|
||||
#else
|
||||
#error libupnp requires largefile mode - use AC_SYS_LARGEFILE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
/*
|
||||
@ -36,7 +31,6 @@
|
||||
#endif /* LIBUPNP_EXPORTS */
|
||||
#endif /* UPNP_STATIC_LIB */
|
||||
|
||||
|
||||
/*
|
||||
* UPNP_INLINE
|
||||
* PRId64
|
||||
@ -50,7 +44,6 @@
|
||||
#define PRIzu "lu"
|
||||
#endif /* UPNP_USE_MSVCPP */
|
||||
|
||||
|
||||
#ifdef UPNP_USE_BCBPP
|
||||
/* define some things Borland Builder doesn't know */
|
||||
#define UPNP_INLINE inline
|
||||
@ -61,10 +54,8 @@
|
||||
#define PRIzu "zu"
|
||||
#endif /* UPNP_USE_BCBPP */
|
||||
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define UPNP_INLINE inline
|
||||
|
||||
/* Note with PRIzu that in the case of Mingw32, it's the MS C
|
||||
* runtime printf which ends up getting called, not the glibc
|
||||
* printf, so it genuinely doesn't have "zu"
|
||||
@ -93,7 +84,7 @@
|
||||
#else
|
||||
#define UPNP_INLINE inline
|
||||
#endif
|
||||
|
||||
|
||||
/*!
|
||||
* \brief Supply the PRId64 printf() macro.
|
||||
*
|
||||
@ -111,7 +102,6 @@
|
||||
#define PRIzu "zu"
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Defining this macro here gives some interesting information about unused
|
||||
* functions in the code. Of course, this should never go uncommented on a
|
||||
@ -119,6 +109,4 @@
|
||||
*/
|
||||
/*#define inline*/
|
||||
|
||||
|
||||
#endif /* UPNPGLOBAL_H */
|
||||
|
||||
|
@ -1,3 +1,6 @@
|
||||
#ifndef SYSDEP_H
|
||||
#define SYSDEP_H
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990- 1993, 1996 Open Software Foundation, Inc.
|
||||
* Copyright (c) 1989 by Hewlett-Packard Company, Palo Alto, Ca. &
|
||||
@ -17,74 +20,57 @@
|
||||
* this software for any purpose.
|
||||
*/
|
||||
|
||||
|
||||
#ifndef SYSDEP_H
|
||||
#define SYSDEP_H
|
||||
|
||||
/*!
|
||||
* \file
|
||||
*/
|
||||
|
||||
#include "ithread.h"
|
||||
|
||||
|
||||
/* change to point to where MD5 .h's live */
|
||||
/* get MD5 sample implementation from RFC 1321 */
|
||||
#include "global.h"
|
||||
#include "md5.h"
|
||||
|
||||
|
||||
#include <sys/types.h>
|
||||
|
||||
|
||||
#ifdef WIN32
|
||||
/* Do not #include <sys/time.h> */
|
||||
#else
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
|
||||
/* set the following to the number of 100ns ticks of the actual
|
||||
resolution of
|
||||
your system's clock */
|
||||
/*! set the following to the number of 100ns ticks of the actual resolution of
|
||||
* your system's clock */
|
||||
#define UUIDS_PER_TICK 1024
|
||||
|
||||
|
||||
/* Set the following to a call to acquire a system wide global lock
|
||||
*/
|
||||
/*! Set the following to a call to acquire a system wide global lock. */
|
||||
extern ithread_mutex_t gUUIDMutex;
|
||||
|
||||
|
||||
#define UUIDLock() ithread_mutex_lock(&gUUIDMutex)
|
||||
#define UUIDUnlock() ithread_mutex_unlock(&gUUIDMutex)
|
||||
|
||||
typedef unsigned long unsigned32;
|
||||
typedef unsigned short unsigned16;
|
||||
typedef unsigned char unsigned8;
|
||||
typedef unsigned char byte;
|
||||
|
||||
typedef unsigned long unsigned32;
|
||||
typedef unsigned short unsigned16;
|
||||
typedef unsigned char unsigned8;
|
||||
typedef unsigned char byte;
|
||||
|
||||
|
||||
/* Set this to what your compiler uses for 64 bit data type */
|
||||
/*! Set this to what your compiler uses for 64 bit data type */
|
||||
#ifdef WIN32
|
||||
#define unsigned64_t __int64
|
||||
#else
|
||||
#define unsigned64_t unsigned long long
|
||||
#endif
|
||||
|
||||
|
||||
#define I64(C) C##LL
|
||||
|
||||
|
||||
typedef unsigned64_t uuid_time_t;
|
||||
|
||||
|
||||
typedef struct {
|
||||
char nodeID[6];
|
||||
} uuid_node_t;
|
||||
|
||||
|
||||
void get_ieee_node_identifier(uuid_node_t *node);
|
||||
void get_system_time(uuid_time_t *uuid_time);
|
||||
void get_ieee_node_identifier(uuid_node_t * node);
|
||||
void get_system_time(uuid_time_t * uuid_time);
|
||||
void get_random_info(unsigned char seed[16]);
|
||||
|
||||
|
||||
#endif /* SYSDEP_H */
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user