diff options
| author | joye <joye> | 2014-03-14 19:24:52 (GMT) |
|---|---|---|
| committer | joye <joye> | 2014-03-14 19:24:52 (GMT) |
| commit | 87f8360524bfac23c1add81d2c5dd528813e45ae (patch) | |
| tree | c6859d2ce3ff2f131b1b3f2366928e75aeb38f38 /src | |
| parent | 60825c55bc5562d64299a132f99958734cf90f98 (diff) | |
| download | blt-87f8360524bfac23c1add81d2c5dd528813e45ae.zip blt-87f8360524bfac23c1add81d2c5dd528813e45ae.tar.gz blt-87f8360524bfac23c1add81d2c5dd528813e45ae.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/bltConfig.C | 11 | ||||
| -rw-r--r-- | src/bltConfig.h | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/bltConfig.C b/src/bltConfig.C index 215a6ab..ebf230a 100644 --- a/src/bltConfig.C +++ b/src/bltConfig.C @@ -36,14 +36,15 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#include <assert.h> #include <stdarg.h> +extern "C" { #include "bltInt.h" #include "bltConfig.h" +}; // State -char* stateObjOption[] = {"normal", "active", "disabled", NULL}; +const char* stateObjOption[] = {"normal", "active", "disabled", NULL}; // Point static Tk_CustomOptionSetProc PointSetProc; @@ -186,7 +187,7 @@ static Tcl_Obj* DashesGetProc(ClientData clientData, Tk_Window tkwin, if (!cnt) return Tcl_NewListObj(0, (Tcl_Obj**)NULL); - Tcl_Obj** ll = calloc(cnt, sizeof(Tcl_Obj*)); + Tcl_Obj** ll = (Tcl_Obj**)calloc(cnt, sizeof(Tcl_Obj*)); for (int ii=0; ii<cnt; ii++) ll[ii] = Tcl_NewIntObj(dashesPtr->values[ii]); Tcl_Obj* listObjPtr = Tcl_NewListObj(cnt, ll); @@ -215,7 +216,7 @@ static int ListSetProc(ClientData clientData, Tcl_Interp *interp, return TCL_ERROR; if (*listPtr) { - Tcl_Free((void*)(*listPtr)); + Tcl_Free(*(char**)listPtr); *listPtr = NULL; } *listPtr = argv; @@ -234,7 +235,7 @@ static Tcl_Obj* ListGetProc(ClientData clientData, Tk_Window tkwin, if (!cnt) return Tcl_NewListObj(0, (Tcl_Obj**)NULL); - Tcl_Obj** ll = calloc(cnt, sizeof(Tcl_Obj*)); + Tcl_Obj** ll = (Tcl_Obj**)calloc(cnt, sizeof(Tcl_Obj*)); for (int ii=0; ii<cnt; ii++) ll[ii] = Tcl_NewStringObj(*listPtr[ii], -1); Tcl_Obj* listObjPtr = Tcl_NewListObj(cnt, ll); diff --git a/src/bltConfig.h b/src/bltConfig.h index c03c5ef..a520ba6 100644 --- a/src/bltConfig.h +++ b/src/bltConfig.h @@ -37,7 +37,7 @@ #define BLT_STATE_ACTIVE (1<<0) #define BLT_STATE_DISABLED (1<<1) -extern char* stateObjOption[]; +extern const char* stateObjOption[]; typedef struct { unsigned char values[12]; |