external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'linux1' of ssh://git.code.sf.net/p/cdesktopenv/code into linux1

Browse source
This commit is contained in:
Peter Howkins 2012-03-23 18:41:17 +00:00
commit f34a9a573f
3 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cde/programs/dticon/Imakefile
View file

@ -53,6 +53,11 @@ SYS_LIBRARIES = -lm -ldl -lgen
EXTRA_DEFINES = EXTRA_DEFINES =
#endif #endif
XCOMM On Linux once you link against a C++ library the whole program
XCOMM has to be linked with the C++ linker
#if defined(LinuxDistribution)
CCLINK = $(CXX)
#endif
SRCS = dtIconShell.c event.c fileIO.c \ SRCS = dtIconShell.c event.c fileIO.c \
fileIODialog.c globals.c graphics.c \ fileIODialog.c globals.c graphics.c \

2
cde/programs/dticon/constants.h
View file

@ -97,8 +97,10 @@ typedef struct {
#define min(a, b) ((a < b) ? a : b) #define min(a, b) ((a < b) ? a : b)
#define max(a, b) ((a > b) ? a : b) #define max(a, b) ((a > b) ? a : b)
#ifndef abs #ifndef abs
#if !defined(linux)
#define abs(a) (((a) < 0) ? -(a) : (a)) #define abs(a) (((a) < 0) ? -(a) : (a))
#endif #endif
#endif
#define mag(a,b) ((a-b) < 0 ? (b-a) : (a-b)) #define mag(a,b) ((a-b) < 0 ? (b-a) : (a-b))
#define DARK 0 #define DARK 0

13
cde/programs/localized/util/merge.c
View file

@ -247,7 +247,13 @@ void cat_open ()
sprintf(line,"/usr/bin/gencat ./.dt_pfile.cat %s",pfile); sprintf(line,"/usr/bin/gencat ./.dt_pfile.cat %s",pfile);
#endif #endif
if ( system(line) != 0 ) if ( system(line) != 0 )
{
/* Utter Linux HACK, it seems the return value of GNU gencat is != 0
even on success */
#if !defined(linux)
fatal("primary .tmsg file would not gencat\n",0,9); fatal("primary .tmsg file would not gencat\n",0,9);
#endif
}
} }
catfile[0] = catopen("./.dt_pfile.cat",0); catfile[0] = catopen("./.dt_pfile.cat",0);
@ -260,7 +266,14 @@ void cat_open ()
sprintf(line,"/usr/bin/gencat ./.dt_dfile.cat %s",dfile); sprintf(line,"/usr/bin/gencat ./.dt_dfile.cat %s",dfile);
#endif #endif
if ( system(line) != 0 ) if ( system(line) != 0 )
{
/* Utter Linux HACK, it seems the return value of GNU gencat is != 0
even on success */
#if !defined(linux)
fatal("default .tmsg file would not gencat\n",0,9); fatal("default .tmsg file would not gencat\n",0,9);
#endif
}
} }
catfile[1] = catopen("./.dt_dfile.cat",0); catfile[1] = catopen("./.dt_dfile.cat",0);