diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2021-05-31 15:05:15 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2021-05-31 15:05:15 (GMT) |
| commit | b92547b9cbb348cfe8ad4d011d0f3317b620af84 (patch) | |
| tree | 42875044ab674624262633f76c4019e7ac7eb448 /win | |
| parent | dc979fdb12f4eceaf533ea12207bd2f64b2643de (diff) | |
| download | tk-b92547b9cbb348cfe8ad4d011d0f3317b620af84.zip tk-b92547b9cbb348cfe8ad4d011d0f3317b620af84.tar.gz tk-b92547b9cbb348cfe8ad4d011d0f3317b620af84.tar.bz2 | |
Merge trunk, remove additional merge conflicts
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 14 | ||||
| -rw-r--r-- | win/tcl.m4 | 1 | ||||
| -rw-r--r-- | win/tkWinInit.c | 9 |
3 files changed, 1 insertions, 23 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index b029d5d..68daeee 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -188,16 +188,9 @@ TKOBJS = \ $(TMP_DIR)\tkWinDraw.obj \
$(TMP_DIR)\tkWinEmbed.obj \
$(TMP_DIR)\tkWinFont.obj \
-<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< $(TMP_DIR)\tkWinGDI.obj \
$(TMP_DIR)\tkWinIco.obj \
$(TMP_DIR)\tkWinImage.obj \
-======= COMMON ANCESTOR content follows ============================ - $(TMP_DIR)\tkWinImage.obj \
-======= MERGED IN content follows ================================== - $(TMP_DIR)\tkWinIco.obj \
- $(TMP_DIR)\tkWinImage.obj \
->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> $(TMP_DIR)\tkWinInit.obj \
$(TMP_DIR)\tkWinKey.obj \
$(TMP_DIR)\tkWinMenu.obj \
@@ -367,14 +360,7 @@ CONFIG_DEFS =/DHAVE_SYS_TYPES_H=1 /DHAVE_SYS_STAT_H=1 \ PRJ_DEFINES = /DBUILD_ttk $(CONFIG_DEFS) /Dinline=__inline /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
# Additional Link libraries needed beyond those in rules.vc
-<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< PRJ_LIBS = netapi32.lib gdi32.lib user32.lib userenv.lib winspool.lib
-======= COMMON ANCESTOR content follows ============================ -PRJ_LIBS = netapi32.lib gdi32.lib user32.lib userenv.lib
-
-======= MERGED IN content follows ================================== -PRJ_LIBS = netapi32.lib gdi32.lib user32.lib userenv.lib
->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #---------------------------------------------------------------------
# TkTest flags
@@ -907,7 +907,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib" fi LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib winspool.lib" ->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}" SHLIB_LD_LIBS='${LIBS}' diff --git a/win/tkWinInit.c b/win/tkWinInit.c index 99c42ad..c96a963 100644 --- a/win/tkWinInit.c +++ b/win/tkWinInit.c @@ -42,17 +42,10 @@ TkpInit( * initialize printing and systray API's here. */ -<<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< WinIcoInit(interp); Winprint_Init(interp); - Gdi_Init(interp); + Gdi_Init(interp); TkWinXInit(Tk_GetHINSTANCE()); -======= COMMON ANCESTOR content follows ============================ - TkWinXInit(Tk_GetHINSTANCE()); -======= MERGED IN content follows ================================== - WinIcoInit(interp); - TkWinXInit(Tk_GetHINSTANCE()); ->>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> return TCL_OK; } |