From 3a850e67c36696ba84e77def0876ca444f5cfff3 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Wed, 21 May 2014 03:58:20 -0700
Subject: [PATCH] libobs:  Move API version info to obs-config.h

This way it doesn't interfere with any actual relevant commits related
to obs.h.
---
 libobs/obs-config.h | 31 ++++++++++++++++++++++++++++++-
 libobs/obs.h        | 31 +------------------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/libobs/obs-config.h b/libobs/obs-config.h
index 4f304fb65..4e110bbff 100644
--- a/libobs/obs-config.h
+++ b/libobs/obs-config.h
@@ -17,6 +17,36 @@
 
 #pragma once
 
+/*
+ * LIBOBS_API_VER is returned by module_version in each module.
+ *
+ * Libobs uses semantic versioning.  See http://semver.org/ for more
+ * information.
+ */
+
+/*
+ * Increment if major breaking API changes
+ */
+#define LIBOBS_API_MAJOR_VER  0 /* 0 means development, anything can break */
+
+/*
+ * Increment if backward-compatible additions
+ *
+ * Reset to zero each major version
+ */
+#define LIBOBS_API_MINOR_VER  2
+
+/*
+ * Increment if backward-compatible bug fix
+ *
+ * Reset to zero each major or minor version
+ */
+#define LIBOBS_API_PATCH_VER  4
+
+#define LIBOBS_API_VER       ((LIBOBS_API_MAJOR_VER << 24) | \
+                              (LIBOBS_API_MINOR_VER << 16) | \
+                               LIBOBS_API_PATCH_VER        )
+
 #ifdef HAVE_OBSCONFIG_H
 # include "obsconfig.h"
 #else
@@ -24,4 +54,3 @@
 #define OBS_VERSION "unknown"
 
 #endif
-
diff --git a/libobs/obs.h b/libobs/obs.h
index e64d5cd99..bf04b9469 100644
--- a/libobs/obs.h
+++ b/libobs/obs.h
@@ -26,6 +26,7 @@
 #include "callback/signal.h"
 #include "callback/proc.h"
 
+#include "obs-config.h"
 #include "obs-defs.h"
 #include "obs-data.h"
 #include "obs-ui.h"
@@ -65,36 +66,6 @@ typedef struct obs_service    *obs_service_t;
 extern "C" {
 #endif
 
-/*
- * LIBOBS_API_VER is returned by module_version in each module.
- *
- * Libobs uses semantic versioning.  See http://semver.org/ for more
- * information.
- */
-
-/*
- * Increment if major breaking API changes
- */
-#define LIBOBS_API_MAJOR_VER  0 /* 0 means development, anything can break */
-
-/*
- * Increment if backward-compatible additions
- *
- * Reset to zero each major version
- */
-#define LIBOBS_API_MINOR_VER  2
-
-/*
- * Increment if backward-compatible bug fix
- *
- * Reset to zero each major or minor version
- */
-#define LIBOBS_API_PATCH_VER  4
-
-#define LIBOBS_API_VER       ((LIBOBS_API_MAJOR_VER << 24) | \
-                              (LIBOBS_API_MINOR_VER << 16) | \
-                               LIBOBS_API_PATCH_VER        )
-
 /** Used for changing the order of items (for example, filters in a source,
  * or items in a scene) */
 enum order_movement {