Small fixes of some svn properties.

SVN-Revision: 4794

diff --git a/mk/msvc/config.h b/mk/msvc/config.h
index 0f88d4f..39117f1 100644 (file)
--- a/mk/msvc/config.h
+++ b/mk/msvc/config.h
@@ -1,158 +1,158 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */\r
-\r
-/* Include pthread support for binary relocation? */\r
-//#undef BR_PTHREAD\r
-\r
-/* define to compile in debug checks */\r
-#define DEBUG\r
-\r
-/* Use binary relocation? */\r
-//#undef ENABLE_BINRELOC\r
-\r
-/* define if sqdbg should be enabled */\r
-//#undef ENABLE_SQDBG\r
-\r
-/* Use the Apple OpenGL framework. */\r
-//#undef HAVE_APPLE_OPENGL_FRAMEWORK\r
-\r
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.\r
-   */\r
-//#undef HAVE_DIRENT_H\r
-\r
-/* Define if you have the iconv() function. */\r
-//#undef HAVE_ICONV\r
-\r
-/* Define to 1 if you have the <inttypes.h> header file. */\r
-//#undef HAVE_INTTYPES_H\r
-\r
-/* Define to 1 if you have the `pthread' library (-lpthread). */\r
-//#undef HAVE_LIBPTHREAD\r
-\r
-/* Define to 1 if you have the <memory.h> header file. */\r
-#define HAVE_MEMORY_H 1\r
-\r
-/* Define to 1 if you have the `mkdir' function. */\r
-//#define HAVE_MKDIR\r
-\r
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */\r
-//#undef HAVE_NDIR_H\r
-\r
-/* Define if you have POSIX threads libraries and header files. */\r
-//#undef HAVE_PTHREAD\r
-\r
-/* Define to 1 if you have the <stdint.h> header file. */\r
-//#undef HAVE_STDINT_H\r
-\r
-/* Define to 1 if you have the <stdlib.h> header file. */\r
-#define HAVE_STDLIB_H 1\r
-\r
-/* Define to 1 if you have the `strdup' function. */\r
-#define HAVE_STRDUP 1\r
-\r
-/* Define to 1 if you have the <strings.h> header file. */\r
-//#define HAVE_STRINGS_H\r
-\r
-/* Define to 1 if you have the <string.h> header file. */\r
-#define HAVE_STRING_H 1\r
-\r
-/* Define to 1 if you have the `strstr' function. */\r
-#define HAVE_STRSTR 1\r
-\r
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.\r
-   */\r
-//#undef HAVE_SYS_DIR_H\r
-\r
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.\r
-   */\r
-//#undef HAVE_SYS_NDIR_H\r
-\r
-/* Define to 1 if you have the <sys/stat.h> header file. */\r
-//#undef HAVE_SYS_STAT_H\r
-\r
-/* Define to 1 if you have the <sys/types.h> header file. */\r
-//#undef HAVE_SYS_TYPES_H\r
-\r
-/* Define to 1 if you have the <unistd.h> header file. */\r
-//#undef HAVE_UNISTD_H\r
-\r
-/* Define to 1 if you have the <windows.h> header file. */\r
-#define HAVE_WINDOWS_H 1\r
-\r
-/* Define as const if the declaration of iconv() needs const. */\r
-#define ICONV_CONST const\r
-\r
-/* Define to the address where bug reports for this package should be sent. */\r
-#define PACKAGE_BUGREPORT ""\r
-\r
-/* Define to the full name of this package. */\r
-#define PACKAGE_NAME "supertux"\r
-\r
-/* Define to the full name and version of this package. */\r
-#define PACKAGE_STRING "supertux 0.3.0-SVN"\r
-\r
-/* Define to the one symbol short name of this package. */\r
-#define PACKAGE_TARNAME "supertux"\r
-\r
-/* Define to the version of this package. */\r
-#define PACKAGE_VERSION "0.3.0-SVN"\r
-\r
-/* Define to necessary symbol if this constant uses a non-standard name on\r
-   your system. */\r
-//#undef PTHREAD_CREATE_JOINABLE\r
-\r
-/* The size of a `void *', as computed by sizeof. */\r
-#define SIZEOF_VOID_P 4\r
-\r
-/* Define to 1 if you have the ANSI C header files. */\r
-#define STDC_HEADERS 1\r
-\r
-/* Define to 1 if your processor stores words with the most significant byte\r
-   first (like Motorola and SPARC, unlike Intel and VAX). */\r
-// #undef WORDS_BIGENDIAN\r
-\r
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a\r
-   `char[]'. */\r
-// #undef YYTEXT_POINTER\r
-\r
-/* Define to empty if `const' does not conform to ANSI C. */\r
-// #undef const\r
-\r
-\r
-#if SIZEOF_VOID_P == 8\r
-#define _SQ64\r
-#endif\r
-\r
-/* Disable some very annoying warnings */\r
-#pragma warning(disable: 4244)\r
-#pragma warning(disable: 4267)\r
-#pragma warning(disable: 4800)\r
-#pragma warning(disable: 4103)\r
-\r
-/* some stuff is not in standard lib in msvc */\r
-#define _CRT_SECURE_NO_DEPRECATE\r
-#define snprintf _snprintf\r
-#define strcasecmp _strcmpi\r
-#define strncasecmp _strncmpi\r
-#define strdup _strdup\r
-\r
-#ifndef M_PI\r
-#define M_PI        3.14159265358979323846\r
-#endif\r
-#ifndef M_PI_2\r
-#define M_PI_2      (3.14159265358979323846/2.0)\r
-#endif\r
-\r
-static inline int roundf(float val)\r
-{\r
-  if(val > 0) {\r
-    return (int) (val + 0.5f);\r
-  } else {\r
-    return (int) (val - 0.5f);\r
-  }\r
-}\r
-\r
-// msvc has no sscanf it seems, this breaks demo recording, but who cares...\r
-static inline int sscanf(...)\r
-{\r
-  return -1;\r
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Include pthread support for binary relocation? */
+//#undef BR_PTHREAD
+
+/* define to compile in debug checks */
+#define DEBUG
+
+/* Use binary relocation? */
+//#undef ENABLE_BINRELOC
+
+/* define if sqdbg should be enabled */
+//#undef ENABLE_SQDBG
+
+/* Use the Apple OpenGL framework. */
+//#undef HAVE_APPLE_OPENGL_FRAMEWORK
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+//#undef HAVE_DIRENT_H
+
+/* Define if you have the iconv() function. */
+//#undef HAVE_ICONV
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+//#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+//#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdir' function. */
+//#define HAVE_MKDIR
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+//#undef HAVE_NDIR_H
+
+/* Define if you have POSIX threads libraries and header files. */
+//#undef HAVE_PTHREAD
+
+/* Define to 1 if you have the <stdint.h> header file. */
+//#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+//#define HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+//#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+//#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+//#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+//#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+//#undef HAVE_UNISTD_H
+
+/* Define to 1 if you have the <windows.h> header file. */
+#define HAVE_WINDOWS_H 1
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST const
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "supertux"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "supertux 0.3.0-SVN"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "supertux"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "0.3.0-SVN"
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+//#undef PTHREAD_CREATE_JOINABLE
+
+/* The size of a `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+// #undef WORDS_BIGENDIAN
+
+/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
+   `char[]'. */
+// #undef YYTEXT_POINTER
+
+/* Define to empty if `const' does not conform to ANSI C. */
+// #undef const
+
+
+#if SIZEOF_VOID_P == 8
+#define _SQ64
+#endif
+
+/* Disable some very annoying warnings */
+#pragma warning(disable: 4244)
+#pragma warning(disable: 4267)
+#pragma warning(disable: 4800)
+#pragma warning(disable: 4103)
+
+/* some stuff is not in standard lib in msvc */
+#define _CRT_SECURE_NO_DEPRECATE
+#define snprintf _snprintf
+#define strcasecmp _strcmpi
+#define strncasecmp _strncmpi
+#define strdup _strdup
+
+#ifndef M_PI
+#define M_PI        3.14159265358979323846
+#endif
+#ifndef M_PI_2
+#define M_PI_2      (3.14159265358979323846/2.0)
+#endif
+
+static inline int roundf(float val)
+{
+  if(val > 0) {
+    return (int) (val + 0.5f);
+  } else {
+    return (int) (val - 0.5f);
+  }
+}
+
+// msvc has no sscanf it seems, this breaks demo recording, but who cares...
+static inline int sscanf(...)
+{
+  return -1;
 }
\ No newline at end of file

diff --git a/mk/msvc/stdint.h b/mk/msvc/stdint.h
index 0390664..7b94ea8 100644 (file)
--- a/mk/msvc/stdint.h
+++ b/mk/msvc/stdint.h
@@ -1,7 +1,7 @@
-#ifndef _STDINT_H\r
-#define _STDINT_H\r
-\r
-// SDL config declares most stdint.h stuff...\r
-#include <sdl_config_win32.h>\r
-\r
+#ifndef _STDINT_H
+#define _STDINT_H
+
+// SDL config declares most stdint.h stuff...
+#include <sdl_config_win32.h>
+
 #endif
\ No newline at end of file