mirror of
https://github.com/rizonesoft/Notepad3.git
synced 2026-06-11 21:03:05 +08:00
+ rpl: replace tellenc by CED in AboutBox
+ upd: uthash library updated to current GitHub dev
This commit is contained in:
parent
8f180c94dc
commit
81e95bf7aa
6
scintilla/src/SciTE.properties
Normal file
6
scintilla/src/SciTE.properties
Normal file
@ -0,0 +1,6 @@
|
||||
# SciTE.properties is the per directory local options file and can be used to override
|
||||
# settings made in SciTEGlobal.properties
|
||||
command.build.directory.*.cxx=..\win32
|
||||
command.build.directory.*.h=..\win32
|
||||
command.build.*.cxx=nmake -f scintilla.mak QUIET=1
|
||||
command.build.*.h=nmake -f scintilla.mak QUIET=1
|
||||
BIN
src/Version.h
BIN
src/Version.h
Binary file not shown.
@ -478,11 +478,20 @@ do {
|
||||
|
||||
/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
|
||||
#define HASH_FIND_STR(head,findstr,out) \
|
||||
HASH_FIND(hh,head,findstr,(unsigned)uthash_strlen(findstr),out)
|
||||
do { \
|
||||
unsigned _uthash_hfstr_keylen = (unsigned)uthash_strlen(findstr); \
|
||||
HASH_FIND(hh, head, findstr, _uthash_hfstr_keylen, out); \
|
||||
} while (0)
|
||||
#define HASH_ADD_STR(head,strfield,add) \
|
||||
HASH_ADD(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add)
|
||||
do { \
|
||||
unsigned _uthash_hastr_keylen = (unsigned)uthash_strlen((add)->strfield); \
|
||||
HASH_ADD(hh, head, strfield[0], _uthash_hastr_keylen, add); \
|
||||
} while (0)
|
||||
#define HASH_REPLACE_STR(head,strfield,add,replaced) \
|
||||
HASH_REPLACE(hh,head,strfield[0],(unsigned)uthash_strlen(add->strfield),add,replaced)
|
||||
do { \
|
||||
unsigned _uthash_hrstr_keylen = (unsigned)uthash_strlen((add)->strfield); \
|
||||
HASH_REPLACE(hh, head, strfield[0], _uthash_hrstr_keylen, add, replaced); \
|
||||
} while (0)
|
||||
#define HASH_FIND_INT(head,findint,out) \
|
||||
HASH_FIND(hh,head,findint,sizeof(int),out)
|
||||
#define HASH_ADD_INT(head,intfield,add) \
|
||||
|
||||
@ -44,8 +44,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
char *d;
|
||||
size_t n; /* allocd size */
|
||||
char *d; /* pointer to allocated buffer */
|
||||
size_t n; /* allocated capacity */
|
||||
size_t i; /* index of first unused byte */
|
||||
} UT_string;
|
||||
|
||||
@ -81,8 +81,8 @@ do { \
|
||||
|
||||
#define utstring_new(s) \
|
||||
do { \
|
||||
s = (UT_string*)calloc(sizeof(UT_string),1); \
|
||||
if (!s) oom(); \
|
||||
(s) = (UT_string*)malloc(sizeof(UT_string)); \
|
||||
if (!(s)) oom(); \
|
||||
utstring_init(s); \
|
||||
} while(0)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user