X-Git-Url: https://git.jankratochvil.net/?p=gnokii.git;a=blobdiff_plain;f=include%2Fmisc.h;h=435314c77317cae457e6290faa21fad8f3f36b4d;hp=2110b154ead55da5693227bb474b215687d7cfed;hb=49dd905279a8e62936e3713510ab0fd738e20ecb;hpb=7fe9e12e4451190f8ca2543a98de9abd4f9b8958 diff --git a/include/misc.h b/include/misc.h index 2110b15..435314c 100644 --- a/include/misc.h +++ b/include/misc.h @@ -13,14 +13,8 @@ Header file for miscellaneous defines, typedefs etc. $Log$ - Revision 1.1.1.2 2001/11/27 04:19:40 short - :pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Tue Nov 27 05:17 CET 2001 - - Revision 1.27 2001/11/26 18:06:08 pkot - Checking for *printf functions, N_(x) for localization, generic ARRAY_LEN, SAFE_STRNCPY, G_GNUC_PRINTF (Jan Kratochvil) - - Revision 1.26 2001/11/14 10:46:12 pkot - Small cleanup with __unices__ + Revision 1.1.1.4 2002/04/03 00:08:19 short + Found in "gnokii-working" directory, some November-patches version Revision 1.25 2001/07/03 15:27:14 pkot AT commands for SMS handling support (Tamas Bondar) @@ -35,39 +29,39 @@ #ifndef __misc_h #define __misc_h -#include "config.h" +#include /* Some general defines. */ #ifndef false -# define false (0) + #define false (0) #endif #ifndef true -# define true (!false) + #define true (!false) #endif #ifndef bool -# define bool int + #define bool int #endif -#define ARRAY_LEN(x) (sizeof((x)) / sizeof((x)[0])) +#define ARRAY_LEN(x) (sizeof((x))/sizeof((x)[0])) -#define SAFE_STRNCPY(dest, src, n) do { \ - strncpy((dest), (src), (n)); \ - if ((n) > 0) \ - (dest)[(n)-1] = '\0'; \ +#define SAFE_STRNCPY(dest,src,n) do { \ + strncpy((dest),(src),(n)); \ + if ((n)>0) \ + (dest)[(n)-1]='\0'; \ } while (0) #define SAFE_STRNCPY_SIZEOF(dest,src) \ - SAFE_STRNCPY((dest), (src), sizeof((dest))) + SAFE_STRNCPY((dest),(src),sizeof((dest))) /* Stolen from : */ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -# define G_GNUC_PRINTF( format_idx, arg_idx ) \ - __attribute__((format (printf, format_idx, arg_idx))) +#define G_GNUC_PRINTF( format_idx, arg_idx ) \ + __attribute__((format (printf, format_idx, arg_idx))) #else /* !__GNUC__ */ -# define G_GNUC_PRINTF( format_idx, arg_idx ) +#define G_GNUC_PRINTF( format_idx, arg_idx ) #endif /* !__GNUC__ */ #define GNOKII_MAX(a, b) (((a) > (b)) ? (a) : (b)) @@ -75,122 +69,118 @@ /* A define to make debug printfs neat */ #ifndef DEBUG -# define dprintf(a...) do { } while (0) +#define dprintf(a...) do { } while (0) #else -# define dprintf(a...) do { fprintf(stderr, a); fflush(stderr); } while (0) +#define dprintf(a...) do { fprintf(stderr, a); fflush(stderr); } while (0) #endif /* Use gsprintf instead of sprintf and sprintf */ #ifdef HAVE_SNPRINTF -# define gsprintf(a, b, c...) snprintf(a, b, c) +# define gsprintf(a, b, c...) snprintf(a, b, c) #else -# define gsprintf(a, b, c...) sprintf(a, c) +# define gsprintf(a, b, c...) sprintf(a, c) #endif #ifdef HAVE_VSNPRINTF -# define gvsprintf(a, b, c...) vsnprintf(a, b, c) +# define gvsprintf(a, b, c...) vsnprintf(a, b, c) #else -# define gvsprintf(a, b, c...) vsprintf(a, c) +# define gvsprintf(a, b, c...) vsprintf(a, c) #endif #ifdef HAVE_ASPRINTF -# define gasprintf(a...) asprintf(a) +# define gasprintf(a...) asprintf(a) #else #include -extern int gasprintf(char **destp, const char *fmt,...); +extern int gasprintf(char **destp,const char *fmt,...); #endif #ifdef HAVE_VASPRINTF -# define gvasprintf(a...) vasprintf(a) +# define gvasprintf(a...) vasprintf(a) #else #include -extern int gvasprintf(char **destp, const char *fmt, va_list ap); +extern int gvasprintf(char **destp,const char *fmt,va_list ap); #endif /* Get rid of long defines. Use #if __unices__ */ #define __unices__ defined(__svr4__) || defined(__FreeBSD__) || defined(__bsdi__) -#if __unices__ -# include -# include -#endif /* This one is for NLS. */ #ifdef USE_NLS -# include -# define _(x) gettext(x) -# define N_(x) gettext_noop(x) + #include + #define _(x) gettext(x) #else -# define _(x) (x) -# define N_(x) (x) + #define _(x) (x) #endif /* USE_NLS */ +#define N_(x) (x) /* Definitions for u8, u16, u32 and u64, borrowed from /usr/src/linux/include/asm-i38/types.h */ #ifndef u8 - typedef unsigned char u8; + typedef unsigned char u8; #endif #ifndef u16 - typedef unsigned short u16; + typedef unsigned short u16; #endif #ifndef u32 - typedef unsigned int u32; + typedef unsigned int u32; #endif #ifndef s32 - typedef int s32; + typedef int s32; #endif #if defined(__GNUC__) && !defined(__STRICT_ANSI__) -# ifndef u64 - typedef unsigned long long u64; -# endif + #ifndef u64 + typedef unsigned long long u64; + #endif -# ifndef s64 - typedef signed long long s64; -# endif + #ifndef s64 + typedef signed long long s64; + #endif #endif /* This one is for FreeBSD and similar systems without __ptr_t_ */ /* FIXME: autoconf should take care of this. */ + #ifndef __ptr_t - typedef void * __ptr_t; + typedef void * __ptr_t; #endif /* __ptr_t */ /* Add here any timer operations which are not supported by libc5 */ #ifndef HAVE_TIMEOPS -# ifdef WIN32 - -# include -# include -# define timersub(a, b, result) - do { - (result)->tv_sec = (a)->time - (b)->time; - (result)->tv_usec = ((a)->millitm - (b)->millitm) * 1000; - if ((result)->tv_usec < 0) { - --(result)->tv_sec; - (result)->tv_usec += 1000000; - } - } while (0) -# define gettimeofday(a, b) _ftime(a) - -# else /* !WIN32 */ -# include - -# ifndef timersub -# define timersub(a, b, result) \ - do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ - } while (0) -# endif /* timersub */ +#ifdef WIN32 + +#include +#include +#define timersub(a, b, result) + do { + (result)->tv_sec = (a)->time - (b)->time; + (result)->tv_usec = ((a)->millitm - (b)->millitm) * 1000; + if ((result)->tv_usec < 0) { + --(result)->tv_sec; + (result)->tv_usec += 1000000; + } + } while (0) +#define gettimeofday(a, b) _ftime(a) + +#else +#include + +#ifndef timersub +#define timersub(a, b, result) \ + do { \ + (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ + (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ + if ((result)->tv_usec < 0) { \ + --(result)->tv_sec; \ + (result)->tv_usec += 1000000; \ + } \ + } while (0) +#endif -# endif /* WIN32 */ +#endif /* WIN32 */ #endif /* HAVE_TIMEOPS */ @@ -199,9 +189,9 @@ extern int GetLine(FILE *File, char *Line, int count); /* For models table */ typedef struct { - char *model; - char *number; - int flags; + char *model; + char *number; + int flags; } PhoneModel; #define PM_CALLERGROUP 0x0001