From 3216b4bb3015936da3490077cacc2879ab159453 Mon Sep 17 00:00:00 2001
From: grymmjack <grymmjack@gmail.com>
Date: Mon, 12 Feb 2024 21:55:39 -0500
Subject: [PATCH] Revert "Moving GJ_LIB_NL into _GJ_LIB_COMMON"

This reverts commit 8b4036ec75892ba368fe0f054f0da4b174707037.
---
 DUMP/DUMP.BI      |  8 +++-----
 _GJ_LIB.BM        |  3 ---
 _GJ_LIB_COMMON.BI |  6 +-----
 _GJ_LIB_COMMON.BM | 16 ----------------
 4 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 _GJ_LIB_COMMON.BM

diff --git a/DUMP/DUMP.BI b/DUMP/DUMP.BI
index 9be4cf9..e6c751a 100644
--- a/DUMP/DUMP.BI
+++ b/DUMP/DUMP.BI
@@ -15,11 +15,9 @@ $IF GJ_LIB_DICT_INC_BI = UNDEFINED THEN
 '$INCLUDE:'../DICT/DICT.BI'
 $END IF
 
-$IF GJ_LIB_NL = UNDEFINED THEN
-    DIM SHARED GJ_LIB_NL AS STRING
-$END IF
-$IF GJ_LIB_NL = UNDEFINED AND WIN THEN
+DIM SHARED GJ_LIB_NL AS STRING
+$IF WIN THEN
     GJ_LIB_NL$ = CHR$(13)
 $ELSE
     GJ_LIB_NL$ = CHR$(10)
-$END IF
\ No newline at end of file
+$END IF
diff --git a/_GJ_LIB.BM b/_GJ_LIB.BM
index 1ed5388..d9fba01 100644
--- a/_GJ_LIB.BM
+++ b/_GJ_LIB.BM
@@ -18,9 +18,6 @@
 $LET GJ_LIB_INC_BM = 1
 
 ' Unified includes to use everything in the library from single BM include
-$IF GJ_LIB_INC_COMMON_BM = UNDEFINED THEN
-'$INCLUDE:'_GJ_LIB_COMMON.BM'
-$END IF
 $IF GJ_LIB_ARR_BYTE_BAS = UNDEFINED THEN
 '$INCLUDE:'ARR/ARR_BYTE.BAS'
 $END IF
diff --git a/_GJ_LIB_COMMON.BI b/_GJ_LIB_COMMON.BI
index ca9cff2..c975d05 100644
--- a/_GJ_LIB_COMMON.BI
+++ b/_GJ_LIB_COMMON.BI
@@ -20,8 +20,4 @@ $IF SLASH = UNDEFINED THEN
     $ELSE
         CONST SLASH$ = "/"
     $END IF 
-$END IF
-
-$IF GJ_LIB_NL = UNDEFINED THEN
-    DIM SHARED GJ_LIB_NL AS STRING
-$END IF
+$END IF
\ No newline at end of file
diff --git a/_GJ_LIB_COMMON.BM b/_GJ_LIB_COMMON.BM
deleted file mode 100644
index e7dc1df..0000000
--- a/_GJ_LIB_COMMON.BM
+++ /dev/null
@@ -1,16 +0,0 @@
-''
-' GRYMMJACK'S LIB FOR QB64
-'
-' This file contains constants and variables common among the entire library.
-'
-' @author Rick Christy <grymmjack@gmail.com>
-'
-$IF GJLIB_COMMON_BM = UNDEFINED THEN
-    $LET GJ_LIB_INC_COMMON_BM = 1 
-$END IF
-
-$IF GJ_LIB_NL = UNDEFINED AND WIN THEN
-    GJ_LIB_NL$ = CHR$(13)
-$ELSE
-    GJ_LIB_NL$ = CHR$(10)
-$END IF
\ No newline at end of file