*/
if (readlink (libcso, buf, PATH_MAX) >= 0) {
for (ptr = buf; *ptr && !isdigit (*ptr); ptr++);
- int ret = sscanf (ptr, "%d.%d.%d", &libcmajor, &libcminor, &libcteeny);
- (void) ret;
- fprintf(inFile, "#define DefaultLinuxCLibMajorVersion %d\n", libcmajor);
- fprintf(inFile, "#define DefaultLinuxCLibMinorVersion %d\n", libcminor);
- fprintf(inFile, "#define DefaultLinuxCLibTeenyVersion %d\n", libcteeny);
+ int ret = sscanf (ptr, "%d.%d.%d", &libcmajor, &libcminor, &libcteeny);
+ (void) ret;
+ fprintf(inFile, "#define DefaultLinuxCLibMajorVersion %d\n", libcmajor);
+ fprintf(inFile, "#define DefaultLinuxCLibMinorVersion %d\n", libcminor);
+ fprintf(inFile, "#define DefaultLinuxCLibTeenyVersion %d\n", libcteeny);
}
} else {
/*
if ((gccproc = popen (cmd, "r")) != NULL) {
if (fgets (buf, PATH_MAX - 1, gccproc) != NULL) {
ptr = strstr (buf, "libgcc.a");
- if (ptr) strncpy (ptr, "include", 7);
+ if (ptr) strncpy (ptr, "include", 8);
}
(void) pclose (gccproc);
break;
{
char *new = Emalloc(strlen(cp) + 1);
- strncpy(new, cp, strlen(cp) + 1);
+ memcpy(new, cp, strlen(cp) + 1);
return new;
}
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_LOGFILES_TOP=\"$(CDE_LOGFILES_TOP)/tmp\"
-INCLUDES = -I. -I../include -I../DtUtil2
+INCLUDES = -I. -I../include -I../DtUtil2 $(TIRPCINC)
SRCS = MemoryMgr.c SbEvent.c Symbolic.c bmsglob.c \
DEFINES = DtSvcDefines \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
-INCLUDES = -I. -I../include
+INCLUDES = -I. -I../include $(TIRPCINC)
HEADERS = \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
-INCLUDES = -I. -I../include
+INCLUDES = -I. -I../include $(TIRPCINC)
#ifdef SunArchitecture
EXTRA_INCLUDES = -I$(DTHELPSRC)
#endif
DEFINES = DtSvcDefines $(XINOPT)
-INCLUDES = -I.
+INCLUDES = -I. $(TIRPCINC)
#ifdef SharedDtSvcReqs
#ifdef SunArchitecture
#include <Threads.tmpl>
-INCLUDES = -I.
+INCLUDES = -I. $(TIRPCINC)
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
#include <Threads.tmpl>
- INCLUDES = -I. -I$(CSASRC) -I../libDtCmP -I$(DTHELPSRC)
+ INCLUDES = -I. -I$(CSASRC) -I../libDtCmP -I$(DTHELPSRC) $(TIRPCINC)
SYS_LIBRARIES = -lm $(ICONVSYSLIB)
DTCMPLIB = ../libDtCmP/libDtCmP.a
extern time_t daylcorr P((time_t, time_t));
extern time_t cm_getdate P((char*, struct timeb *));
+int yylex();
extern void yyerror(char *s);
#endif
%{
#ifndef lint
+__attribute__((unused))
static char sccsid[] = "@(#)getdate.y 1.10 94/11/07 Copyr 1993 Sun Microsystems, Inc.";
#endif
%}
{dayord = 1; dayreq = $1;}
| DAY ','
{dayord = 1; dayreq = $1;}
- | NUMBER DAY
- {dayord = $1; dayreq = $2;};
+ | NUMBER ' ' DAY
+ {dayord = $1; dayreq = $3;};
dtspec: NUMBER '/' NUMBER
{month = $1; day = $3; noyear = 1;}
{month = $1; day = $2; noyear = 1;}
| MONTH NUMBER ',' NUMBER
{month = $1; day = $2; year = $4;}
- | NUMBER MONTH
- {month = $2; day = $1; noyear = 1;}
- | NUMBER MONTH NUMBER
- {month = $2; day = $1; year = $3;};
+ | NUMBER ' ' MONTH
+ {month = $3; day = $1; noyear = 1;}
+ | NUMBER ' ' MONTH ' ' NUMBER
+ {month = $3; day = $1; year = $5;};
-rspec: NUMBER UNIT
- {relsec += 60L * $1 * $2;}
- | NUMBER MUNIT
- {relmonth += $1 * $2;}
- | NUMBER SUNIT
+rspec: NUMBER ' ' UNIT
+ {relsec += 60L * $1 * $3;}
+ | NUMBER ' ' MUNIT
+ {relmonth += $1 * $3;}
+ | NUMBER ' ' SUNIT
{relsec += $1;}
| UNIT
{relsec += 60L * $1;}
lookup(char *id)
{
#define gotit (yylval=i->value, i->type)
-#define getid for(j=idvar, k=id; *j++ = *k++; )
+#define getid for(j=idvar, k=id; (*j++ = *k++); )
char idvar[20];
register char *j, *k;
static char *lptr;
-yylex()
+int yylex()
{
extern int yylval;
int sign;
hh = mm = ss = 0;
merid = 24;
- if (err = yyparse()) return (-1);
+ if ((err = yyparse())) return (-1);
mcheck(timeflag);
mcheck(zoneflag);
PROGRAM = rpc.cmsd
- INCLUDES = -I. -I$(CSASRC) -I$(DTHELPSRC)
- SYS_LIBRARIES = DtClientSysLibs
+ INCLUDES = -I. -I$(CSASRC) -I$(DTHELPSRC) $(TIRPCINC)
+ SYS_LIBRARIES = DtClientSysLibs $(TIRPCLIB)
#ifdef SunArchitecture
LOCAL_LIBRARIES = $(CSALIB) $(DTSVCLIB) $(TTLIB)
#else
*/
DEPEND_DEFINES = $(DEPENDDEFINES)
- INCLUDES = -I.
+ INCLUDES = -I. $(TIRPCINC)
#if defined (SunArchitecture)
DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) \
$(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB)
* It should be set when necessary to the real library macro name.
*/
- INCLUDES = -I.
+ INCLUDES = -I. $(TIRPCINC)
/* DEPLIBS contains the list of library depencies for a client.
* LOCAL_LIBRARIES contains the list of libraries on the link line.
LOCAL_LIBRARIES = $(TTLIB) $(XTOOLLIB) $(XLIB)
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DMSGLOG_CLIENT_ONLY
-INCLUDES = -I.
+INCLUDES = -I. $(TIRPCINC)
SRCS = DtGetMessage.c Main.c MsgLog.c Version.c
OBJS = DtGetMessage.o Main.o MsgLog.o Version.o
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DKORNSHELL=\"$(KORNSHELL)\" $(XINOPT)
-INCLUDES = -I./dtcopy
+INCLUDES = -I./dtcopy $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs $(XINLIB)
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -D__TOOLTALK
-INCLUDES = -I.
+INCLUDES = -I. $(TIRPCINC)
#if defined (SunArchitecture)
DEPLIBS = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \
result_set->append(new Feature(next.key()->name(),
value));
}
- mcatch_noarg(badEvaluationException)
+ mcatch_noarg(badEvaluationException&)
{
/* do nothing...we just ignore any that will not evaluate */
}
};
#ifdef C_API
-#define g_memory_pool (*g_memory_pool_ptr)
+#define g_memory_pool *g_memory_pool_ptr
extern memory_pool* g_memory_pool_ptr;
#endif
void* data_t::operator new( size_t x )
{
//return (void*)data_t_space_pool.alloc(x);
- return (void*)g_memory_pool.alloc(x);
+ return (void*)(g_memory_pool).alloc(x);
}
void data_t::operator delete( void* ptr )
{
//data_t_space_pool.free((char*)ptr);
- g_memory_pool.free((char*)ptr);
+ (g_memory_pool).free((char*)ptr);
}
)
v_str_index = new chunks_index(storage_ptr, v_str_ptr.loc);
- if ( v_str_index ) {
+ if ( v_str_index ) {
- str_index_record_t* anchor = v_str_index -> chunk_location(left);
+ str_index_record_t* anchor = v_str_index -> chunk_location(left);
//debug(cerr, left - anchor -> str_offset);
- storage_ptr ->
- readString(anchor -> loc, sink,
- right-left, left - anchor -> str_offset
- );
+ storage_ptr ->
+ readString(anchor -> loc, sink,
+ right-left, left - anchor -> str_offset
+ );
} else
}
+#if __cplusplus < 201103L
void* operator new( size_t sz ) throw(std::bad_alloc)
+#else
+void* operator new( size_t sz )
+#endif
{
void* p = (void*)malloc(sz);
//printf("a::operator new called(). sz= %d, allo=%x\n", sz, p);
user_base::checking_status_t user_base::check_lock()
{
- char lock_dir[PATHSIZ];
+ char lock_dir[PATHSIZ+5];
int len;
snprintf(lock_dir, sizeof(lock_dir), "%s/%s", base_path, LOCK_DIR);
void* fbytes_t::operator new( size_t x )
{
//return (void*)heap_cell_space_pool.alloc(x);
- return (void*)g_memory_pool.alloc(x);
+ return (void*)(g_memory_pool).alloc(x);
}
void fbytes_t::operator delete( void* ptr )
{
//heap_cell_space_pool.free((char*)ptr);
- g_memory_pool.free((char*)ptr);
+ (g_memory_pool).free((char*)ptr);
}
{
if ( i + v_aptr > v_eptr )
MESSAGE(cerr, "buffer::skip(): underflow");
- throw ( CASTBNDEXCEPT boundaryException( long(v_aptr), long(v_eptr), long(i + v_aptr) ));
+ throw ( CASTBNDEXCEPT boundaryException( long(v_aptr), long(v_eptr), long(i + v_aptr) ));
v_aptr += i;
return *this;
NormalCplusplusObjectRule()
DEPEND_DEFINES = $(DEPENDDEFINES)
-INCLUDES = -I.
+INCLUDES = -I. $(TIRPCINC)
#ifdef AIXArchitecture
LDPOSTLIB=-blibpath:/usr/dt/lib:/X11/lib:/usr/lib/threads:/usr/lib:/lib
NormalCplusplusObjectRule()
#ifdef DoLicenseManagement
-INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
+ $(MMDB_INCLUDES) $(LICENSE_L_INCLUDES) $(TIRPCINC)
EXTRA_DEFINES=-DLICENSE_MANAGEMENT
#else
XCOMM Should remove LICENSE_L_INCLUDES from this list in this case
-INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
+ $(COMMON_CLASS_INCLUDES) $(TIRPCINC)
#endif
#include "Classlist.mk"
{
if (f_dialog == NULL)
create_ui(parent);
- if (g_active)
+ if (g_active)
return (100);
g_active = TRUE;
else
return OLIST_ERROR;
- f_size++;
+ f_size++;
return OLIST_OK;
}
SYS_LIBRARIES=-lm
#endif
-INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) -I. $(BROWSER_INCLUDES) $(MMDB_INCLUDES) \
+ $(TIRPCINC)
OLIASNORMALLIBS= \
Agents/libAgents.a \
NormalCplusplusObjectRule()
-INCLUDES=$(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) $(COMMON_CLASS_INCLUDES)
+INCLUDES = $(CXXDEPENDINCLUDES) $(BROWSER_INCLUDES) \
+ $(COMMON_CLASS_INCLUDES) $(TIRPCINC)
#include "Classlist.mk"
{
style_sheet_mgr().initOnlineStyleSheet(node_ptr);
}
- mcatch_noarg (StyleSheetSyntaxError)
+ mcatch_noarg (StyleSheetSyntaxError&)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39, "File a Bug")));
{
style_sheet_mgr().initPrintStyleSheet(node_ptr);
}
- mcatch_noarg (StyleSheetSyntaxError)
+ mcatch_noarg (StyleSheetSyntaxError&)
{
message_mgr().error_dialog(
(char*)UAS_String(CATGETS(Set_Messages, 39,
mtry {
styleparse ();
}
- mcatch_noarg (StyleSheetSyntaxError) {
+ mcatch_noarg (StyleSheetSyntaxError&) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow
mtry {
styleparse ();
}
- mcatch_noarg (StyleSheetSyntaxError) {
+ mcatch_noarg (StyleSheetSyntaxError&) {
fLastSS = 0;
delete fCurrent;
{ // Don't remove these curlies. For destructors before rethrow
-/*
- * CDE - Common Desktop Environment
- *
- * Copyright (c) 1993-2012, The Open Group. All rights reserved.
- *
- * These libraries and programs are free software; you can
- * redistribute them and/or modify them under the terms of the GNU
- * Lesser General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * These libraries and programs are distributed in the hope that
- * they will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with these libraries and programs; if not, write
- * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
- * Floor, Boston, MA 02110-1301 USA
- */
#define Set_CatMgr 1
#define Set_DtSR_Parser 2
#define Set_SearchMgr 3
case I_C_M: cgm_s->auxcolr[3] = b_guint(&dat_ptr, cgm_s->cindprec);
break;
case D_C_M: for (i=0; i<3; ++i)
- cgm_s->auxcolr[i] = b_gsint(&dat_ptr, cgm_s->colprec);
+ cgm_s->auxcolr[i] = b_gsint(&dat_ptr, cgm_s->colprec);
break;
}
return 1;
/* just 4 VDC's to grab */
switch (cgm_s->vdctype) {
case VDC_INT: for (i=0; i<4; ++i)
- cgm_s->corient[i].i = b_gsint(&dat_ptr, cgm_s->vdcintprec);
+ cgm_s->corient[i].i = b_gsint(&dat_ptr, cgm_s->vdcintprec);
break;
- case VDC_REAL: for (i=0; i<4; ++i)
- cgm_s->corient[i].r = b_real(&dat_ptr, &(cgm_s->vdcrprec));
+ case VDC_REAL: for (i=0; i<4; ++i)
+ cgm_s->corient[i].r = b_real(&dat_ptr, &(cgm_s->vdcrprec));
break;
}
return 1;
PosixError(int error_no, const char *msg)
{ f_errno = error_no;
- *((char *) memcpy(f_msg, msg, MAXMSG+1) + MAXMSG+1) = '\0'; };
+ strncpy(f_msg, msg, MAXMSG+1); };
const char *msg(void) const { return f_msg; };
int error_no(void) const { return f_errno; };
KSH93SRC = ./ksh93
DEPEND_DEFINES = $(DEPENDDEFINES)
-INCLUDES = -I. -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include -I$(KSH93SRC)/src/cmd/ksh93
+INCLUDES = -I. -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include \
+ -I$(KSH93SRC)/src/cmd/ksh93 $(TIRPCINC)
/* DEPLIBS contains the list of library depencies for a client.
* LOCAL_LIBRARIES contains the list of libraries on the link line.
#include <Threads.tmpl>
-INCLUDES = -I../include/MotifApp -I../include -I../include/utils
+INCLUDES = -I../include/MotifApp -I../include -I../include/utils $(TIRPCINC)
#ifndef DtMailDefines
# define DtMailDefines
INCLUDES = -I. -I../include -I../include/MotifApp \
-I../include/utils -I../include/DtMail \
- -I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) $(STD_INCLUDES)
+ -I../libDtMail/RFC -I$(CDELIBSRC) -I$(DTHELPSRC) \
+ $(STD_INCLUDES) $(TIRPCINC)
#ifndef DtMailDefines
# define DtMailDefines
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
INCLUDES = -I. -I../include -I../../dtcompat -I../../../. \
- -I$(CDELIBSRC) $(STD_INCLUDES)
+ -I$(CDELIBSRC) $(STD_INCLUDES) $(TIRPCINC)
#ifndef DtMailDefines
# define DtMailDefines
#include <Threads.tmpl>
-INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
+INCLUDES = -I. -I../../include -I../../include/utils -I$(CDELIBSRC) \
+ $(STD_INCLUDES) $(TIRPCINC)
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK
#include <Threads.tmpl>
-INCLUDES = -I. -I../Common -I../../include -I../../include/utils -I$(CDELIBSRC) $(STD_INCLUDES)
+INCLUDES = -I. -I../Common -I../../include -I../../include/utils \
+ -I$(CDELIBSRC) $(STD_INCLUDES) $(TIRPCINC)
#if HasVFork
VFORK_DEFINES = -DHAS_VFORK
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DDT_LITE -DWORDWRAP -UNLS16
+INCLUDES = $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
-INCLUDES = -I. -I../libCliSrv
+INCLUDES = -I. -I../libCliSrv $(TIRPCINC)
LOCAL_LIBRARIES = ../libCliSrv/libCliSrv.a $(TTLIB) $(XTOOLLIB) $(XLIB)
DEPLIBS = ../libCliSrv/libCliSrv.a $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
-INCLUDES = -I.
+INCLUDES = -I. $(TIRPCINC)
#ifdef SunArchitecture
SYS_LIBRARIES = -ldl -lintl
DEFINES = -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
-DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\"
-INCLUDES = -I. -I$(DTHELPSRC)
+INCLUDES = -I. -I$(DTHELPSRC) $(TIRPCINC)
#ifdef HPArchitecture
EXTRA_DEFINES = -D_XOPEN_SOURCE -D__hpux_8_0 -DFUNCPROTO
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
-INCLUDES = -I. -I$(DTHELPSRC)/..
+INCLUDES = -I. -I$(DTHELPSRC)/.. $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs
$(XMLIB) $(XTOOLLIB) $(XLIB) $(UTILLIB)
SYS_LIBRARIES = DtClientSysLibs
-INCLUDES = -I. -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term -I$(DTTERMSRC)/TermView
+INCLUDES = -I. -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term \
+ -I$(DTTERMSRC)/TermView $(TIRPCINC)
SRCS = \
DtTermLogit.c \
DEPEND_DEFINES = $(DEPENDDEFINES)
DEFINES = $(MWMDEFINES) $(DTWMDEFINES) -DMULTIBYTE -DMINIMAL_DT
+INCLUDES = $(TIRPCINC)
DEPLIBS = DepDtClientLibs
LOCAL_LIBRARIES = DtClientLibs -lDtXinerama
#define CplusplusSource YES
DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+INCLUDES = $(TIRPCINC)
EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
DEPLIBS = $(DEPDTTERMLIB) DepDtClientLibs $(DEPUTILLIB)
projects / oweals / cde.git / commitdiff