From b6aa2d67518ad50fdd96a64bd175d9ab6d8cbf02 Mon Sep 17 00:00:00 2001 From: das Date: Wed, 2 Apr 2008 21:32:32 +0000 Subject: * generic/tkDecls.h: make genstubs * generic/tkIntDecls.h: * generic/tkIntPlatDecls.h: * generic/tkIntXlibDecls.h: * generic/tkPlatDecls.h: * generic/tkStubInit.c: --- generic/tkDecls.h | 22 +++++++--------------- generic/tkInt.h | 4 ++-- generic/tkIntDecls.h | 14 +++----------- generic/tkIntPlatDecls.h | 14 +++----------- generic/tkIntXlibDecls.h | 14 +++----------- generic/tkPlatDecls.h | 14 +++----------- generic/tkStubInit.c | 4 ++-- 7 files changed, 23 insertions(+), 63 deletions(-) diff --git a/generic/tkDecls.h b/generic/tkDecls.h index b0dca8b..c0e0ac5 100644 --- a/generic/tkDecls.h +++ b/generic/tkDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkDecls.h,v 1.31 2008/04/01 16:30:53 dgp Exp $ + * RCS: @(#) $Id: tkDecls.h,v 1.32 2008/04/02 21:32:32 das Exp $ */ #ifndef _TKDECLS @@ -1696,15 +1696,15 @@ EXTERN void Tk_CreateOldPhotoImageFormat ( #endif typedef struct TkStubHooks { - struct TkPlatStubs *tkPlatStubs; - struct TkIntStubs *tkIntStubs; - struct TkIntPlatStubs *tkIntPlatStubs; - struct TkIntXlibStubs *tkIntXlibStubs; + CONST struct TkPlatStubs *tkPlatStubs; + CONST struct TkIntStubs *tkIntStubs; + CONST struct TkIntPlatStubs *tkIntPlatStubs; + CONST struct TkIntXlibStubs *tkIntXlibStubs; } TkStubHooks; typedef struct TkStubs { int magic; - struct TkStubHooks *hooks; + CONST struct TkStubHooks *hooks; void (*tk_MainLoop) (void); /* 0 */ XColor * (*tk_3DBorderColor) (Tk_3DBorder border); /* 1 */ @@ -1983,15 +1983,7 @@ typedef struct TkStubs { } TkStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TkStubs *tkStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TkStubs *tkStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkInt.h b/generic/tkInt.h index 7ae4bee..039d28e 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: $Id: tkInt.h,v 1.82 2008/03/26 19:04:09 jenglish Exp $ + * RCS: $Id: tkInt.h,v 1.83 2008/04/02 21:32:32 das Exp $ */ #ifndef _TKINT @@ -43,7 +43,7 @@ # ifdef BIG_ENDIAN # if BYTE_ORDER == BIG_ENDIAN # undef WORDS_BIGENDIAN -# define WORDS_BIGENDIAN +# define WORDS_BIGENDIAN 1 # endif # endif # ifdef LITTLE_ENDIAN diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index 5729545..3dc3cbf 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkIntDecls.h,v 1.32 2008/04/01 16:30:53 dgp Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.33 2008/04/02 21:32:32 das Exp $ */ #ifndef _TKINTDECLS @@ -961,7 +961,7 @@ EXTERN int TkpTesttextCmd (ClientData dummy, typedef struct TkIntStubs { int magic; - struct TkIntStubHooks *hooks; + CONST struct TkIntStubHooks *hooks; TkWindow * (*tkAllocWindow) (TkDisplay * dispPtr, int screenNum, TkWindow * parentPtr); /* 0 */ void (*tkBezierPoints) (double control[], int numSteps, double * coordPtr); /* 1 */ @@ -1223,15 +1223,7 @@ typedef struct TkIntStubs { } TkIntStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TkIntStubs *tkIntStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TkIntStubs *tkIntStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index 95881cd..84720fa 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.30 2008/04/01 16:30:53 dgp Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.31 2008/04/02 21:32:32 das Exp $ */ #ifndef _TKINTPLATDECLS @@ -556,7 +556,7 @@ EXTERN int TkpTestsendCmd (ClientData clientData, typedef struct TkIntPlatStubs { int magic; - struct TkIntPlatStubHooks *hooks; + CONST struct TkIntPlatStubHooks *hooks; #ifdef __WIN32__ /* WIN */ char * (*tkAlignImageData) (XImage * image, int alignment, int bitOrder); /* 0 */ @@ -671,15 +671,7 @@ typedef struct TkIntPlatStubs { } TkIntPlatStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TkIntPlatStubs *tkIntPlatStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TkIntPlatStubs *tkIntPlatStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index 759f162..2dae5b6 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.24 2008/04/01 16:30:53 dgp Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.25 2008/04/02 21:32:32 das Exp $ */ #ifndef _TKINTXLIBDECLS @@ -1212,7 +1212,7 @@ EXTERN int XSync (Display * display, Bool flag); typedef struct TkIntXlibStubs { int magic; - struct TkIntXlibStubHooks *hooks; + CONST struct TkIntXlibStubHooks *hooks; #ifdef __WIN32__ /* WIN */ void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */ @@ -1420,15 +1420,7 @@ typedef struct TkIntXlibStubs { } TkIntXlibStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TkIntXlibStubs *tkIntXlibStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TkIntXlibStubs *tkIntXlibStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index 8502923..d1219cc 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPlatDecls.h,v 1.16 2008/04/01 16:30:54 dgp Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.17 2008/04/02 21:32:33 das Exp $ */ #ifndef _TKPLATDECLS @@ -131,7 +131,7 @@ EXTERN int Tk_MacOSXIsAppInFront (void); typedef struct TkPlatStubs { int magic; - struct TkPlatStubHooks *hooks; + CONST struct TkPlatStubHooks *hooks; #ifdef __WIN32__ /* WIN */ Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */ @@ -157,15 +157,7 @@ typedef struct TkPlatStubs { } TkPlatStubs; #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) - -#ifdef __cplusplus -extern "C" { -#endif -extern TkPlatStubs *tkPlatStubsPtr; -#ifdef __cplusplus -} -#endif - +EXTERN CONST TkPlatStubs *tkPlatStubsPtr; #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ #if defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index 5480540..ef40e30 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.60 2007/12/13 15:24:16 dgp Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.61 2008/04/02 21:32:33 das Exp $ */ #include "tkInt.h" @@ -666,7 +666,7 @@ TkPlatStubs tkPlatStubs = { #endif /* AQUA */ }; -static TkStubHooks tkStubHooks = { +static const TkStubHooks tkStubHooks = { &tkPlatStubs, &tkIntStubs, &tkIntPlatStubs, -- cgit v0.12