New upstream version 25.0.3+dfsg1

libobs/util/c99defs.h

@@ -18,61 +18,26 @@
 
 /*
  * Contains hacks for getting some C99 stuff working in VC, things like
- * bool, inline, stdint
+ * bool, stdint
  */
 
 #define UNUSED_PARAMETER(param) (void)param
 
 #ifdef _MSC_VER
-#define DEPRECATED __declspec(deprecated)
+#define OBS_DEPRECATED __declspec(deprecated)
 #define FORCE_INLINE __forceinline
 #else
-#define DEPRECATED __attribute__((deprecated))
+#define OBS_DEPRECATED __attribute__((deprecated))
 #define FORCE_INLINE inline __attribute__((always_inline))
 #endif
 
 #ifdef _MSC_VER
-
-/* Microsoft is one of the most inept companies on the face of the planet.
- * The fact that even visual studio 2013 doesn't support the standard 'inline'
- * keyword is so incredibly stupid that I just can't imagine what sort of
- * incredibly inept moron could possibly be managing the visual C compiler
- * project.  They should be fired, and legally forbidden to have a job in
- * ANYTHING even REMOTELY related to programming.  FOREVER.  This should also
- * apply to the next 10 generations all of their descendants. */
-#ifndef __cplusplus
-#define inline __inline
-#endif
-
 #define EXPORT __declspec(dllexport)
 #else
 #define EXPORT
 #endif
 
-#if _MSC_VER && _MSC_VER < 0x0708
-
-#include "vc/vc_stdint.h"
-#include "vc/vc_stdbool.h"
-
-#ifndef __off_t_defined
-#define __off_t_defined
-#if _FILE_OFFSET_BITS == 64
-typedef long long off_t;
-#else
-typedef long off_t;
-#endif
-typedef int64_t off64_t;
-#endif /* __off_t_defined */
-
-#define SIZE_T_FORMAT "%u"
-
-#else
-
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/types.h>
-
-#define SIZE_T_FORMAT "%zu"
-
-#endif /* _MSC_VER */