reorganized includes, added versioning macros, update rev

woodruffw · Sep 21, 2014 · 09477b1 · 09477b1
1 parent ee59987
commit 09477b1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/screenfetch-c.c b/src/screenfetch-c.c
@@ -49,6 +49,15 @@
 	If you have any questions, please contact me on github (http://www.github.com/woodruffw/screenfetch-c) or at william @ tuffbizz.com
 */
 
+#define _POSIX_C_SOURCE 200112L /* makes all these systems play nicely together */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <getopt.h>
+
 #include "screenfetch-c.h" /* contains all other includes, function prototypes, macros */
 #include "logos.h" /* contains ascii logos */
 #include "thread.h" /* for cross-platform threading */
@@ -2407,7 +2416,7 @@ void main_text_output(char* data[], char* data_names[])
 */
 void display_version(void)
 {
-	printf("%s\n", "screenfetch-c - Version 1.2, revision 5");
+	printf("%s\n", "screenfetch-c - Version " SCREENFETCH_C_VERSION_MAJOR "." SCREENFETCH_C_VERSION_MINOR ", revision " SCREENFETCH_C_VERSION_RELEASE ".");
 	return;
 }
 

diff --git a/src/screenfetch-c.h b/src/screenfetch-c.h
@@ -10,15 +10,10 @@
 #ifndef SCREENFETCH_C_H
 #define SCREENFETCH_C_H
 
-#define _POSIX_C_SOURCE 200112L /* makes all these systems play nicely together */
-
-/* includes, all from the standard library */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
+/* version macros */
+#define SCREENFETCH_C_VERSION_MAJOR "1"
+#define SCREENFETCH_C_VERSION_MINOR "2"
+#define SCREENFETCH_C_VERSION_RELEASE "6"
 
 /* a number is assigned to each OS or OS family */
 #define UNKNOWN 0
@@ -73,7 +68,6 @@
 	#define OS UNKNOWN
 #endif
 
-
 /* color/fmt definitions */
 #define TNRM "\x1B[0m" /* normal */
 #define TBLK "\x1B[30m" /* black */
@@ -103,7 +97,6 @@
 #define ERROR_OUT(str1, str2) (fprintf(stderr, TWHT "[[ " TLRD "!" TWHT " ]] " TNRM "%s%s\n", str1, str2))
 #define VERBOSE_OUT(str1, str2) (fprintf(stdout, TLRD ":: " TNRM "%s%s\n", str1, str2))
 
-
 /* screenfetch detection function definitions */
 void detect_distro(char* str);
 void detect_arch(char* str);