r2996 - branches/rtcp_ntp/include
mikma at minisip.org
mikma at minisip.org
Wed Dec 6 22:54:45 CET 2006
Author: mikma
Date: 2006-12-06 22:54:44 +0100 (Wed, 06 Dec 2006)
New Revision: 2996
Modified:
branches/rtcp_ntp/include/config.h
Log:
Fix eol-style
Modified: branches/rtcp_ntp/include/config.h
===================================================================
--- branches/rtcp_ntp/include/config.h 2006-12-06 21:50:35 UTC (rev 2995)
+++ branches/rtcp_ntp/include/config.h 2006-12-06 21:54:44 UTC (rev 2996)
@@ -1,174 +1,174 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/* Copyright (C) 2004
- *
- * Authors: Erik Eliasson <eliasson at it.kth.se>
- * Johan Bilien <jobi at via.ecp.fr>
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#define LIBMUTIL_IMPORTS
-#define LIBMNETUTIL_IMPORTS
-#define LIBMSIP_IMPORTS
-#define LIBMIKEY_IMPORTS
-
-
-
-//#define DISABLE_OSS
-//#define DISABLE_ALSA
-
-/* Compilation time configuration */
-
-#ifdef _MSC_VER
-
-#define DSOUND
-
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
-#endif
-
-#pragma warning (disable: 4251)
-
-#ifndef WIN32
-#define WIN32
-#endif
-
-#ifndef uint8_t
-typedef unsigned char uint8_t;
-#endif
-
-#ifndef byte_t
-typedef unsigned char byte_t;
-#endif
-
-#ifndef int16_t
-typedef __int16 int16_t;
-#endif
-
-#ifndef uint16_t
-typedef unsigned short uint16_t;
-#endif
-
-#ifndef int32_t
-typedef __int32 int32_t;
-#endif
-
-#ifndef uint32_t
-typedef unsigned int uint32_t;
-#endif
-
-#ifndef int64_t
-typedef __int64 int64_t;
-#endif
-
-#ifndef uint64_t
-typedef unsigned long long uint64_t;
-#endif
-
-#else // !_MSC_VER
-#include"compilation_config.h"/* STL replacement */
-#include<stdint.h>
-
-#ifdef __MINGW32__
-# define WINVER 0x0500
-# define DSOUND
-#else // !__MINGW32__
-# define ENABLE_TS
-#endif // !__MINGW32__
-
-#endif // !_MSC_VER
-
-// FIXME!!
-
-#ifndef WIN32
-#define LINUX
-#endif
-
-
-
-#ifdef USE_STL
-#undef __NO_ISOCEXT
-using namespace std;
-#include<string>
-
-#else
-
-#endif
-
-typedef uint8_t byte_t;
-
-
-/* big/little endian conversion */
-
-static inline uint16_t U16_AT( void const * _p )
-{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint16_t)p[0] << 8) | p[1] );
-}
-static inline uint32_t U32_AT( void const * _p )
-{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16)
- | ((uint32_t)p[2] << 8) | p[3] );
-}
-static inline uint64_t U64_AT( void const * _p )
-{
- const uint8_t * p = (const uint8_t *)_p;
- return ( ((uint64_t)p[0] << 56) | ((uint64_t)p[1] << 48)
- | ((uint64_t)p[2] << 40) | ((uint64_t)p[3] << 32)
- | ((uint64_t)p[4] << 24) | ((uint64_t)p[5] << 16)
- | ((uint64_t)p[6] << 8) | p[7] );
-}
-#if defined WORDS_BIGENDIAN
-# define hton16(i) ( i )
-# define hton32(i) ( i )
-# define hton64(i) ( i )
-# define ntoh16(i) ( i )
-# define ntoh32(i) ( i )
-# define ntoh64(i) ( i )
-#else
-# define hton16(i) U16_AT(&i)
-# define hton32(i) U32_AT(&i)
-# define hton64(i) U64_AT(&i)
-# define ntoh16(i) U16_AT(&i)
-# define ntoh32(i) U32_AT(&i)
-# define ntoh64(i) U64_AT(&i)
-#endif
-
-
-
-#ifdef DEBUG_OUTPUT
-#define MSM_DEBUG
-#define MSM_DEBUG_COMMAND
-#endif
-
-#define SOUND_CARD_FREQ 48000
-
-#if defined(WIN32) && !defined(__MINGW32__)
-#define TEXT_UI
-//#define DEBUG_OUTPUT
-#include<iostream>
-using namespace std;
-#endif
-
-#ifndef HAVE_UINT
-typedef unsigned int uint;
-#endif
-
-#endif
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+/* Copyright (C) 2004
+ *
+ * Authors: Erik Eliasson <eliasson at it.kth.se>
+ * Johan Bilien <jobi at via.ecp.fr>
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#define LIBMUTIL_IMPORTS
+#define LIBMNETUTIL_IMPORTS
+#define LIBMSIP_IMPORTS
+#define LIBMIKEY_IMPORTS
+
+
+
+//#define DISABLE_OSS
+//#define DISABLE_ALSA
+
+/* Compilation time configuration */
+
+#ifdef _MSC_VER
+
+#define DSOUND
+
+#ifndef _WIN32_WINNT
+#define _WIN32_WINNT 0x0500
+#endif
+
+#pragma warning (disable: 4251)
+
+#ifndef WIN32
+#define WIN32
+#endif
+
+#ifndef uint8_t
+typedef unsigned char uint8_t;
+#endif
+
+#ifndef byte_t
+typedef unsigned char byte_t;
+#endif
+
+#ifndef int16_t
+typedef __int16 int16_t;
+#endif
+
+#ifndef uint16_t
+typedef unsigned short uint16_t;
+#endif
+
+#ifndef int32_t
+typedef __int32 int32_t;
+#endif
+
+#ifndef uint32_t
+typedef unsigned int uint32_t;
+#endif
+
+#ifndef int64_t
+typedef __int64 int64_t;
+#endif
+
+#ifndef uint64_t
+typedef unsigned long long uint64_t;
+#endif
+
+#else // !_MSC_VER
+#include"compilation_config.h"/* STL replacement */
+#include<stdint.h>
+
+#ifdef __MINGW32__
+# define WINVER 0x0500
+# define DSOUND
+#else // !__MINGW32__
+# define ENABLE_TS
+#endif // !__MINGW32__
+
+#endif // !_MSC_VER
+
+// FIXME!!
+
+#ifndef WIN32
+#define LINUX
+#endif
+
+
+
+#ifdef USE_STL
+#undef __NO_ISOCEXT
+using namespace std;
+#include<string>
+
+#else
+
+#endif
+
+typedef uint8_t byte_t;
+
+
+/* big/little endian conversion */
+
+static inline uint16_t U16_AT( void const * _p )
+{
+ const uint8_t * p = (const uint8_t *)_p;
+ return ( ((uint16_t)p[0] << 8) | p[1] );
+}
+static inline uint32_t U32_AT( void const * _p )
+{
+ const uint8_t * p = (const uint8_t *)_p;
+ return ( ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16)
+ | ((uint32_t)p[2] << 8) | p[3] );
+}
+static inline uint64_t U64_AT( void const * _p )
+{
+ const uint8_t * p = (const uint8_t *)_p;
+ return ( ((uint64_t)p[0] << 56) | ((uint64_t)p[1] << 48)
+ | ((uint64_t)p[2] << 40) | ((uint64_t)p[3] << 32)
+ | ((uint64_t)p[4] << 24) | ((uint64_t)p[5] << 16)
+ | ((uint64_t)p[6] << 8) | p[7] );
+}
+#if defined WORDS_BIGENDIAN
+# define hton16(i) ( i )
+# define hton32(i) ( i )
+# define hton64(i) ( i )
+# define ntoh16(i) ( i )
+# define ntoh32(i) ( i )
+# define ntoh64(i) ( i )
+#else
+# define hton16(i) U16_AT(&i)
+# define hton32(i) U32_AT(&i)
+# define hton64(i) U64_AT(&i)
+# define ntoh16(i) U16_AT(&i)
+# define ntoh32(i) U32_AT(&i)
+# define ntoh64(i) U64_AT(&i)
+#endif
+
+
+
+#ifdef DEBUG_OUTPUT
+#define MSM_DEBUG
+#define MSM_DEBUG_COMMAND
+#endif
+
+#define SOUND_CARD_FREQ 48000
+
+#if defined(WIN32) && !defined(__MINGW32__)
+#define TEXT_UI
+//#define DEBUG_OUTPUT
+#include<iostream>
+using namespace std;
+#endif
+
+#ifndef HAVE_UINT
+typedef unsigned int uint;
+#endif
+
+#endif
Property changes on: branches/rtcp_ntp/include/config.h
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
More information about the Minisip-devel
mailing list