Index: Makefile.in
===================================================================
diff -u -rb8ca306282c9a1000b1c93ffd97f7f4673953f65 -rb69a6989827fe4b926f24d42f4dee151974e5b9a
--- Makefile.in	(.../Makefile.in)	(revision b8ca306282c9a1000b1c93ffd97f7f4673953f65)
+++ Makefile.in	(.../Makefile.in)	(revision b69a6989827fe4b926f24d42f4dee151974e5b9a)
@@ -159,7 +159,8 @@
 PACKAGE_VERSION	= @PACKAGE_VERSION@
 CC		= @CC@
 CFLAGS_DEFAULT	= @CFLAGS_DEFAULT@
-# useful for debugging:  --param=ssp-buffer-size=4 -fstack-protector-all 
+# useful for debugging:
+#CFLAGS_DEFAULT	= -pedantic -g -std=c99 -DTCL_NO_DEPRECATED -DTCL_NO_DEPRECATED -Wconversion -Wsign-conversion -Wfloat-conversion -Wsign-compare
 CFLAGS_WARNING	= @CFLAGS_WARNING@
 CLEANFILES	= @CLEANFILES@
 EXEEXT		= @EXEEXT@
Index: generic/nsf.c
===================================================================
diff -u -r9df6b50237ae89bc387ec217237538d08c0f8d39 -rb69a6989827fe4b926f24d42f4dee151974e5b9a
--- generic/nsf.c	(.../nsf.c)	(revision 9df6b50237ae89bc387ec217237538d08c0f8d39)
+++ generic/nsf.c	(.../nsf.c)	(revision b69a6989827fe4b926f24d42f4dee151974e5b9a)
@@ -16819,6 +16819,7 @@
       trt.usec = 0;
     }
 #endif
+
     if ((cmdFlags & NSF_CMD_DEPRECATED_METHOD) != 0) {
       NsfDeprecatedCmd(interp, "proc", ObjStr(objv[0]), "");
     }
@@ -18829,7 +18830,7 @@
 TclDeletesObject(ClientData clientData) {
   NsfObject *object;
   Tcl_Interp *interp;
-  
+
   nonnull_assert(clientData != NULL);
 
   object = (NsfObject *)clientData;
@@ -23078,11 +23079,11 @@
       {
         Proc *procPtr = GetTclProcFromCommand(cmd);
 
-	if (procPtr == NULL) {
+        if (procPtr == NULL) {
           Tcl_SetObjResult(interp, Tcl_NewStringObj("body not available for this kind of method", -1));
           return TCL_ERROR;
-	}
-	if (procPtr->bodyPtr->typePtr == Nsf_OT_byteCodeType) {
+        }
+        if (procPtr->bodyPtr->typePtr == Nsf_OT_byteCodeType) {
           EXTERN Tcl_Obj *Tcl_DisassembleByteCodeObj(Tcl_Interp *interp, Tcl_Obj *objPtr);
 
           Tcl_SetObjResult(interp, Tcl_DisassembleByteCodeObj(interp, procPtr->bodyPtr));
@@ -24472,7 +24473,7 @@
 
   nonnull_assert(interp != NULL);
 
-  Tcl_SetObjResult(interp, Tcl_NewIntObj(((Interp *)interp)->compileEpoch));
+  Tcl_SetObjResult(interp, Tcl_NewIntObj((int)(((Interp *)interp)->compileEpoch)));
   return TCL_OK;
 }
 
@@ -27161,7 +27162,7 @@
     return result;
   }
 
-  if (parsedParam.paramDefs != NULL || with_Debug != 0) {
+  if (parsedParam.paramDefs != NULL || with_Debug != 0 || with_Deprecated != 0) {
     /*
      * We need parameter handling. In such cases, a thin C-based layer
      * is added which handles the parameter passing and calls the proc
Index: generic/nsf.tcl
===================================================================
diff -u -r4befd49a711512427661098a7de2957992a09cfd -rb69a6989827fe4b926f24d42f4dee151974e5b9a
--- generic/nsf.tcl	(.../nsf.tcl)	(revision 4befd49a711512427661098a7de2957992a09cfd)
+++ generic/nsf.tcl	(.../nsf.tcl)	(revision b69a6989827fe4b926f24d42f4dee151974e5b9a)
@@ -165,6 +165,7 @@
   }
   proc ::nsf::debug::exit {level objectInfo methodInfo result usec} {
     nsf::log Debug "exit($level) - $objectInfo $methodInfo $usec usec -> $result"
+>>>>>>> master
   }
 
   #
Index: generic/predefined.h
===================================================================
diff -u -r4befd49a711512427661098a7de2957992a09cfd -rb69a6989827fe4b926f24d42f4dee151974e5b9a
--- generic/predefined.h	(.../predefined.h)	(revision 4befd49a711512427661098a7de2957992a09cfd)
+++ generic/predefined.h	(.../predefined.h)	(revision b69a6989827fe4b926f24d42f4dee151974e5b9a)
@@ -66,9 +66,11 @@
 "nsf::log Debug \"call($level) - $objectInfo $methodInfo $arglist\"}\n"
 "proc ::nsf::debug::exit {level objectInfo methodInfo result usec} {\n"
 "nsf::log Debug \"exit($level) - $objectInfo $methodInfo $usec usec -> $result\"}\n"
+>>>>>>> master
 "proc ::nsf::deprecated {what oldCmd newCmd} {\n"
 "set msg \"*** $what $oldCmd is deprecated.\"\n"
 "if {$newCmd ne \"\"} {append msg \" use $newCmd instead.\"}\n"
+"puts stderr HERE\n"
 "nsf::log Warning $msg}\n"
 "proc tmpdir {} {\n"
 "foreach e [list TMPDIR TEMP TMP] {\n"