Finish merge of sf/pdp11

stardot · Sep 23, 2019 · 25294b7 · 25294b7
1 parent 6ce37fc
commit 25294b7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/musahi/m68kconf.h b/src/musahi/m68kconf.h
@@ -204,7 +204,7 @@ extern void mc68000_cpu_preexec(unsigned pc);
  * NOTE: not enabling inline functions will SEVERELY slow down emulation.
  */
 #ifndef INLINE
-#define INLINE static __inline__
+#define INLINE static inline
 #endif /* INLINE */
 
 #endif /* M68K_COMPILE_FOR_MAME */

diff --git a/utils/b-em-version-str.sh b/utils/b-em-version-str.sh
@@ -17,5 +17,5 @@ if grep -q -i '^ISRELEASED="yes"' ./configure.ac; then
 	# A release build.  Strip the git information off the tag name.
 	git describe --tags --abbrev=0 2>/dev/null || echo "$B_EM_VERSION"
 else
-	git describe --always --long --dirty
+	git describe --always --long
 fi