Don't unconditionally define _GNU_SOURCE

Also, fix build if JIM_OPTIMIZATION is disabled

Signed-off-by: Steve Bennett <steveb@workware.net.au>

1 files changed, 10 insertions, 3 deletions

diff --git a/jim.c b/jim.c
index 1532c1c..d7d5f0e 100644
--- a/jim.c
+++ b/jim.c
@@ -41,6 +41,7 @@
  * official policies, either expressed or implied, of the Jim Tcl Project.
  **/
 #define JIM_OPTIMIZATION        /* comment to avoid optimizations and reduce size */
+#define _GNU_SOURCE             /* Mostly just for environ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -115,6 +116,12 @@ static void JimPanicDump(int fail_condition, const char *fmt, ...);
 #define JimPanic(X)
 #endif
 
+#ifdef JIM_OPTIMIZATION
+#define JIM_IF_OPTIM(X) X
+#else
+#define JIM_IF_OPTIM(X)
+#endif
+
 /* -----------------------------------------------------------------------------
  * Global variables
  * ---------------------------------------------------------------------------*/
@@ -11907,16 +11914,16 @@ static int Jim_ForCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *argv
 
         if (retval == JIM_OK || retval == JIM_CONTINUE) {
             /* increment */
-          evalnext:
+JIM_IF_OPTIM(evalnext:)
             retval = Jim_EvalObj(interp, argv[3]);
             if (retval == JIM_OK || retval == JIM_CONTINUE) {
                 /* test */
-              testcond:
+JIM_IF_OPTIM(testcond:)
                 retval = Jim_GetBoolFromExpr(interp, argv[2], &boolean);
             }
         }
     }
-  out:
+JIM_IF_OPTIM(out:)
     if (stopVarNamePtr) {
         Jim_DecrRefCount(interp, stopVarNamePtr);
     }