Index: trunk/scconfig/Rev.h =================================================================== --- trunk/scconfig/Rev.h (revision 30915) +++ trunk/scconfig/Rev.h (revision 30916) @@ -1 +1 @@ -static const int myrev = 30915; +static const int myrev = 30916; Index: trunk/scconfig/Rev.tab =================================================================== --- trunk/scconfig/Rev.tab (revision 30915) +++ trunk/scconfig/Rev.tab (revision 30916) @@ -1,4 +1,4 @@ -30915 configure pcb_ -> rnd_ renames in librnd +30916 configure pcb_ -> rnd_ renames in librnd 30779 configure remove distaligntext - all cases handled by distalign properly 30754 configure remove the old import_sch plugin (in favor of import_sch2) 30753 configure disable the old drc, enable the new drc Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 30915) +++ trunk/src/draw.c (revision 30916) @@ -57,7 +57,7 @@ pcb_output_t pcb_draw_out; /* global context used for drawing */ -rnd_box_t pcb_draw_invalidated = { COORD_MAX, COORD_MAX, -COORD_MAX, -COORD_MAX }; +rnd_box_t pcb_draw_invalidated = { RND_COORD_MAX, RND_COORD_MAX, -RND_COORD_MAX, -RND_COORD_MAX }; int pcb_draw_force_termlab = 0; rnd_bool pcb_draw_doing_assy = pcb_false; @@ -158,8 +158,8 @@ pcb_render->invalidate_lr(pcb_render, pcb_draw_invalidated.X1, pcb_draw_invalidated.X2, pcb_draw_invalidated.Y1, pcb_draw_invalidated.Y2); /* shrink the update block */ - pcb_draw_invalidated.X1 = pcb_draw_invalidated.Y1 = COORD_MAX; - pcb_draw_invalidated.X2 = pcb_draw_invalidated.Y2 = -COORD_MAX; + pcb_draw_invalidated.X1 = pcb_draw_invalidated.Y1 = RND_COORD_MAX; + pcb_draw_invalidated.X2 = pcb_draw_invalidated.Y2 = -RND_COORD_MAX; } static void draw_everything_holes(pcb_draw_info_t *info, pcb_layergrp_id_t gid) Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 30915) +++ trunk/src/file_act.c (revision 30916) @@ -425,7 +425,7 @@ } sep = strrchr(name, '.'); - if ((sep != NULL) && (strchr(sep, PCB_DIR_SEPARATOR_C) == NULL)) { + if ((sep != NULL) && (strchr(sep, RND_DIR_SEPARATOR_C) == NULL)) { *sep = '\0'; ending = sep+1; sep = "."; Index: trunk/src/librnd/config.h.in =================================================================== --- trunk/src/librnd/config.h.in (revision 30915) +++ trunk/src/librnd/config.h.in (revision 30916) @@ -32,13 +32,13 @@ @] print {\n\n/* Macro to add a funciton attribute to suppress "function unused" for static inline functions declared in .h files */\n} -print_ternary ?cc/func_attr/unused/presents {#define PCB_FUNC_UNUSED __attribute__((unused))} {#define PCB_FUNC_UNUSED} +print_ternary ?cc/func_attr/unused/presents {#define RND_FUNC_UNUSED __attribute__((unused))} {#define RND_FUNC_UNUSED} print {\n\n/* inline, as detected ("inline" or empty) */\n} print_ternary ?cc/inline {#define RND_INLINE_DETECTED inline} {#define RND_INLINE_DETECTED /* no inline */} print {\n\n/* final, combined keywords and attributes for an inline function */\n} -print {#define RND_INLINE static RND_INLINE_DETECTED PCB_FUNC_UNUSED\n\n} +print {#define RND_INLINE static RND_INLINE_DETECTED RND_FUNC_UNUSED\n\n} print {\n\n/* Wether setenv() works */\n} print_ternary ?libs/env/setenv/presents {#define RND_HAVE_SETENV 1} {/* #undef RND_HAVE_SETENV */} @@ -56,96 +56,96 @@ print_ternary ?libs/socket/select/presents {#define RND_HAVE_SELECT 1} {/* #undef RND_HAVE_SELECT */} print {\n\n/* Define to 1 if you have the `snprintf' function. */\n} -print_ternary ?libs/snprintf {#define HAVE_SNPRINTF 1} {/* #undef HAVE_SNPRINTF */} +print_ternary ?libs/snprintf {#define RND_HAVE_SNPRINTF 1} {/* #undef RND_HAVE_SNPRINTF */} print {\n\n/* Define to 1 if you have the `vsnprintf' function. */\n} -print_ternary ?libs/vsnprintf {#define HAVE_VSNPRINTF 1} {/* #undef HAVE_VSNPRINTF */} +print_ternary ?libs/vsnprintf {#define RND_HAVE_VSNPRINTF 1} {/* #undef RND_HAVE_VSNPRINTF */} print {\n\n/* Define to 1 if you have the `getcwd' function. */\n} -print_ternary ?libs/fs/getcwd/presents {#define HAVE_GETCWD 1} {/* #undef HAVE_GETCWD */} +print_ternary ?libs/fs/getcwd/presents {#define RND_HAVE_GETCWD 1} {/* #undef RND_HAVE_GETCWD */} print {\n\n/* Define to 1 if you have the `_getcwd' function. */\n} -print_ternary ?libs/fs/_getcwd/presents {#define HAVE__GETCWD 1} {/* #undef HAVE__GETCWD */} +print_ternary ?libs/fs/_getcwd/presents {#define RND_HAVE__GETCWD 1} {/* #undef RND_HAVE__GETCWD */} print {\n\n/* Define to 1 if you have the `getwd' function. */\n} -print_ternary ?libs/fs/_getwd/presents {#define HAVE_GETWD 1} {/* #undef HAVE_GETWD */} +print_ternary ?libs/fs/_getwd/presents {#define RND_HAVE_GETWD 1} {/* #undef RND_HAVE_GETWD */} print {\n\n/* Define to 1 if you have the header file. */\n} -print_ternary ?libs/gui/gd/presents {#define HAVE_GD_H 1} {/* #undef HAVE_GD_H */} +print_ternary ?libs/gui/gd/presents {#define RND_HAVE_GD_H 1} {/* #undef RND_HAVE_GD_H */} print {\n\n/* Define to 1 if you have the `gdImageGif' function. */\n} -print_ternary ?libs/gui/gd/gdImageGif/presents {#define HAVE_GDIMAGEGIF 1} {/* #undef HAVE_GDIMAGEGIF */} +print_ternary ?libs/gui/gd/gdImageGif/presents {#define RND_HAVE_GDIMAGEGIF 1} {/* #undef RND_HAVE_GDIMAGEGIF */} print {\n\n/* Define to 1 if you have the `gdImageJpeg' function. */\n} -print_ternary ?libs/gui/gd/gdImageJpeg/presents {#define HAVE_GDIMAGEJPEG 1} {/* #undef HAVE_GDIMAGEJPEG */} +print_ternary ?libs/gui/gd/gdImageJpeg/presents {#define RND_HAVE_GDIMAGEJPEG 1} {/* #undef RND_HAVE_GDIMAGEJPEG */} print {\n\n/* Define to 1 if you have the `gdImagePng' function. */\n} -print_ternary ?libs/gui/gd/gdImagePng/presents {#define HAVE_GDIMAGEPNG 1} {/* #undef HAVE_GDIMAGEPNG */} +print_ternary ?libs/gui/gd/gdImagePng/presents {#define RND_HAVE_GDIMAGEPNG 1} {/* #undef RND_HAVE_GDIMAGEPNG */} print {\n\n/* Define to 1 if you have the `gdImageSetResolution' function. */\n} -print_ternary ?libs/gui/gd/gdImageSetResolution/presents {#define HAVE_GD_RESOLUTION 1} {/* #undef HAVE_GD_RESOLUTION */} +print_ternary ?libs/gui/gd/gdImageSetResolution/presents {#define RND_HAVE_GD_RESOLUTION 1} {/* #undef RND_HAVE_GD_RESOLUTION */} print {\n\n/* Define to 1 if you have the `getpwuid' function. */\n} -print_ternary ?libs/userpass/getpwuid/presents {#define HAVE_GETPWUID 1} {/* #undef HAVE_GETPWUID */} +print_ternary ?libs/userpass/getpwuid/presents {#define RND_HAVE_GETPWUID 1} {/* #undef RND_HAVE_GETPWUID */} print {\n\n/* Define to 1 if you have the `rint' function. */\n} -print_ternary ?libs/math/rint/presents {#define HAVE_RINT 1} {/* #undef HAVE_RINT */} +print_ternary ?libs/math/rint/presents {#define RND_HAVE_RINT 1} {/* #undef RND_HAVE_RINT */} print {\n\n/* Define to 1 if you have the `round' function. */\n} -print_ternary ?libs/math/round/presents {#define HAVE_ROUND 1} {/* #undef HAVE_ROUND */} +print_ternary ?libs/math/round/presents {#define RND_HAVE_ROUND 1} {/* #undef RND_HAVE_ROUND */} print {\n\n/* Wrapper for S_ISLNK(x); always return 0 if S_ISLNK doesn't exist */\n} switch ?/target/libs/fs/stat/macros/S_ISLNK - case {^$} print {#define WRAP_S_ISLNK(x) 0}; end; - default print [@#define WRAP_S_ISLNK(x) @/target/libs/fs/stat/macros/S_ISLNK@(x)@]; end; + case {^$} print {#define RND_WRAP_S_ISLNK(x) 0}; end; + default print [@#define RND_WRAP_S_ISLNK(x) @/target/libs/fs/stat/macros/S_ISLNK@(x)@]; end; end; print {\n\n/* Define to 1 if Xinerama is available */\n} -print_ternary ?libs/gui/xinerama/presents {#define HAVE_XINERAMA 1} {/*#undef HAVE_XINERAMA */} +print_ternary ?libs/gui/xinerama/presents {#define RND_HAVE_XINERAMA 1} {/*#undef RND_HAVE_XINERAMA */} print {\n\n/* Define to 1 if Xrender is available */\n} -print_ternary ?libs/gui/xrender/presents {#define HAVE_XRENDER 1} {/*#undef HAVE_XRENDER */} +print_ternary ?libs/gui/xrender/presents {#define RND_HAVE_XRENDER 1} {/*#undef RND_HAVE_XRENDER */} print {\n\n/* Define to 1 if we should use windows api for dynamic linking. */\n} -print_ternary ?libs/LoadLibrary/presents {#define USE_LOADLIBRARY 1} {/* #undef USE_LOADLIBRARY */} +print_ternary ?libs/LoadLibrary/presents {#define RND_USE_LOADLIBRARY 1} {/* #undef RND_USE_LOADLIBRARY */} print {\n\n/* Define to 1 if we should use mkdtemp for creating temp files. */\n} -print_ternary ?libs/fs/mkdtemp/presents {#define HAVE_MKDTEMP 1} {/* #undef HAVE_MKDTEMP */} +print_ternary ?libs/fs/mkdtemp/presents {#define RND_HAVE_MKDTEMP 1} {/* #undef RND_HAVE_MKDTEMP */} print {\n\n/* Define to 1 if you have the `realpath' function. */\n} -print_ternary ?libs/fs/realpath/presents {#define HAVE_REALPATH 1} {/* #undef HAVE_REALPATH */} +print_ternary ?libs/fs/realpath/presents {#define RND_HAVE_REALPATH 1} {/* #undef RND_HAVE_REALPATH */} print {\n\n/* Select which mechanism to use for running child processes. */\n} -print_ternary ?/target/libs/proc/wait/presents {#define USE_FORK_WAIT 1} {/* #undef USE_FORK_WAIT */} +print_ternary ?/target/libs/proc/wait/presents {#define RND_USE_FORK_WAIT 1} {/* #undef RND_USE_FORK_WAIT */} print {\n} -print_ternary ?/target/libs/proc/_spawnvp/presents {#define USE_SPAWNVP 1} {/* #undef USE_SPAWNVP */} +print_ternary ?/target/libs/proc/_spawnvp/presents {#define RND_USE_SPAWNVP 1} {/* #undef RND_USE_SPAWNVP */} print {\n\n/* Select which mechanism to use for creating a directory. */\n} -print_ternary ?/target/libs/fs/mkdir/presents {#define USE_MKDIR 1} {/* #undef USE_MKDIR */} +print_ternary ?/target/libs/fs/mkdir/presents {#define RND_USE_MKDIR 1} {/* #undef RND_USE_MKDIR */} print {\n} -print_ternary ?/target/libs/fs/_mkdir/presents {#define USE__MKDIR 1} {/* #undef USE__MKDIR */} +print_ternary ?/target/libs/fs/_mkdir/presents {#define RND_USE__MKDIR 1} {/* #undef RND_USE__MKDIR */} print [@ -#define MKDIR_NUM_ARGS 0@?/target/libs/fs/_mkdir/num_args@@?/target/libs/fs/mkdir/num_args@ +#define RND_MKDIR_NUM_ARGS 0@?/target/libs/fs/_mkdir/num_args@@?/target/libs/fs/mkdir/num_args@ @] print {\n\n/* Define whether we have specific signals. */\n} -print_ternary ?signal/names/SIGPIPE/presents {#define PCB_HAVE_SIGPIPE 1} {/* #undef PCB_HAVE_SIGPIPE */} +print_ternary ?signal/names/SIGPIPE/presents {#define RND_HAVE_SIGPIPE 1} {/* #undef RND_HAVE_SIGPIPE */} print {\n} -print_ternary ?signal/names/SIGSEGV/presents {#define PCB_HAVE_SIGSEGV 1} {/* #undef PCB_HAVE_SIGSEGV */} +print_ternary ?signal/names/SIGSEGV/presents {#define RND_HAVE_SIGSEGV 1} {/* #undef RND_HAVE_SIGSEGV */} print {\n} -print_ternary ?signal/names/SIGABRT/presents {#define PCB_HAVE_SIGABRT 1} {/* #undef PCB_HAVE_SIGABRT */} +print_ternary ?signal/names/SIGABRT/presents {#define RND_HAVE_SIGABRT 1} {/* #undef RND_HAVE_SIGABRT */} print {\n} -print_ternary ?signal/names/SIGINT/presents {#define PCB_HAVE_SIGINT 1} {/* #undef PCB_HAVE_SIGINT */} +print_ternary ?signal/names/SIGINT/presents {#define RND_HAVE_SIGINT 1} {/* #undef RND_HAVE_SIGINT */} print {\n} -print_ternary ?signal/names/SIGHUP/presents {#define PCB_HAVE_SIGHUP 1} {/* #undef PCB_HAVE_SIGHUP */} +print_ternary ?signal/names/SIGHUP/presents {#define RND_HAVE_SIGHUP 1} {/* #undef RND_HAVE_SIGHUP */} print {\n} -print_ternary ?signal/names/SIGTERM/presents {#define PCB_HAVE_SIGTERM 1} {/* #undef PCB_HAVE_SIGTERM */} +print_ternary ?signal/names/SIGTERM/presents {#define RND_HAVE_SIGTERM 1} {/* #undef RND_HAVE_SIGTERM */} print {\n} -print_ternary ?signal/names/SIGQUIT/presents {#define PCB_HAVE_SIGQUIT 1} {/* #undef PCB_HAVE_SIGQUIT */} +print_ternary ?signal/names/SIGQUIT/presents {#define RND_HAVE_SIGQUIT 1} {/* #undef RND_HAVE_SIGQUIT */} print {\n} print {\n\n/* Wether fungw is system installed */\n} -print_ternary /local/pcb/fungw_system {#define PCB_HAVE_SYS_FUNGW 1} {/* #undef PCB_HAVE_SYS_FUNGW */} +print_ternary /local/pcb/fungw_system {#define RND_HAVE_SYS_FUNGW 1} {/* #undef RND_HAVE_SYS_FUNGW */} print {\n/* Code warnings for TODO, portable (unlike #warning) */} if ?cc/pragma_message @@ -164,22 +164,22 @@ #define HOST "@sys/sysid@" /* Directory separator char */ -#define PCB_DIR_SEPARATOR_C '@sys/path_sep_escaped@' +#define RND_DIR_SEPARATOR_C '@sys/path_sep_escaped@' /* Directory separator string */ -#define PCB_DIR_SEPARATOR_S "@sys/path_sep_escaped@" +#define RND_DIR_SEPARATOR_S "@sys/path_sep_escaped@" /* Search path separator string */ -#define PCB_PATH_DELIMETER ":" +#define RND_PATH_DELIMETER ":" /****************************************************************************/ /* These are static; they are kept "just in case", for further porting */ /* C89 has atexit() */ -#define HAS_ATEXIT 1 +#define RND_HAS_ATEXIT 1 /* C89 has this */ -#define HAVE_UNISTD_H 1 +#define RND_HAVE_UNISTD_H 1 /* Define to 1 if you have the `canonicalize_file_name' function. It's a GNU extension, assume we don't have it and fall back to @@ -196,7 +196,7 @@ /* Coordinate type and properties, as detected by scconfig */ typedef @/local/pcb/coord_type@ rnd_coord_t; -#define COORD_MAX @/local/pcb/coord_max@ +#define RND_COORD_MAX @/local/pcb/coord_max@ #define coord_abs pcb_coord_abs /* Other autodetected types */ Index: trunk/src/librnd/core/compat_fs.c =================================================================== --- trunk/src/librnd/core/compat_fs.c (revision 30915) +++ trunk/src/librnd/core/compat_fs.c (revision 30916) @@ -58,9 +58,9 @@ char *pcb_get_wd(char *path) { -#if defined(HAVE_GETCWD) +#if defined(RND_HAVE_GETCWD) return getcwd(path, PCB_PATH_MAX); -#elif defined(HAVE__GETCWD) +#elif defined(RND_HAVE__GETCWD) return _getcwd(path, PCB_PATH_MAX); #else /* seems that some BSD releases lack of a prototype for getwd() */ @@ -68,9 +68,9 @@ #endif } -#if defined(USE_MKDIR) +#if defined(RND_USE_MKDIR) # define MKDIR mkdir -#elif defined(USE__MKDIR) +#elif defined(RND_USE__MKDIR) # define MKDIR _mkdir #else # error no mkdir() available @@ -77,9 +77,9 @@ #endif int pcb_mkdir_(const char *path, int mode) { -#if MKDIR_NUM_ARGS == 1 +#if RND_MKDIR_NUM_ARGS == 1 return MKDIR(path); -#elif MKDIR_NUM_ARGS == 2 +#elif RND_MKDIR_NUM_ARGS == 2 return MKDIR(path, mode); #else # error invalid number of arguments for mkdir @@ -100,13 +100,13 @@ int pcb_spawnvp(const char **argv) { -#if defined(USE_SPAWNVP) +#if defined(RND_USE_SPAWNVP) int result = _spawnvp(_P_WAIT, argv[0], (const char *const *) argv); if (result == -1) return 1; else return 0; -#elif defined(USE_FORK_WAIT) +#elif defined(RND_USE_FORK_WAIT) int pid; pid = fork(); if (pid < 0) { @@ -166,11 +166,11 @@ *c = '/'; return res; #else -#ifdef HAVE_MKDTEMP +#ifdef RND_HAVE_MKDTEMP #ifdef inline /* Suppress compiler warnings; -Dinline means we are compiling in --debug with -ansi -pedantic; we do know that mkdtemp exists on the system, - since HAVE_MKDTEMP is set. */ + since RND_HAVE_MKDTEMP is set. */ char *mkdtemp(char *template); #endif const char *tmpdir; @@ -180,7 +180,7 @@ assert(name != NULL); -#ifdef HAVE_MKDTEMP +#ifdef RND_HAVE_MKDTEMP #define TEMPLATE "pcb.XXXXXXXX" @@ -199,7 +199,7 @@ *mytmpdir = '\0'; (void) strcat(mytmpdir, tmpdir); - (void) strcat(mytmpdir, PCB_DIR_SEPARATOR_S); + (void) strcat(mytmpdir, RND_DIR_SEPARATOR_S); (void) strcat(mytmpdir, TEMPLATE); if (mkdtemp(mytmpdir) == NULL) { fprintf(stderr, "pcb_spawnvp(): mkdtemp (\"%s\") failed\n", mytmpdir); @@ -218,7 +218,7 @@ *tmpfile = '\0'; (void) strcat(tmpfile, mytmpdir); - (void) strcat(tmpfile, PCB_DIR_SEPARATOR_S); + (void) strcat(tmpfile, RND_DIR_SEPARATOR_S); (void) strcat(tmpfile, name); free(mytmpdir); @@ -243,7 +243,7 @@ return 0; #endif -#ifdef HAVE_MKDTEMP +#ifdef RND_HAVE_MKDTEMP int e, rc2 = 0; char *dname; @@ -253,7 +253,7 @@ /* now figure out the directory name to remove */ e = strlen(name) - 1; - while (e > 0 && name[e] != PCB_DIR_SEPARATOR_C) { + while (e > 0 && name[e] != RND_DIR_SEPARATOR_C) { e--; } Index: trunk/src/librnd/core/compat_lrealpath.c =================================================================== --- trunk/src/librnd/core/compat_lrealpath.c (revision 30915) +++ trunk/src/librnd/core/compat_lrealpath.c (revision 30916) @@ -38,7 +38,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#ifdef RND_HAVE_UNISTD_H #include #endif #include @@ -50,7 +50,7 @@ extern char *canonicalize_file_name(const char *); #endif -#if defined(HAVE_REALPATH) +#if defined(RND_HAVE_REALPATH) #if defined (PATH_MAX) #define REALPATH_LIMIT PATH_MAX #else @@ -102,7 +102,7 @@ pathconf()) making it impossible to pass a correctly sized buffer to realpath() (it could always overflow). On those systems, we skip this. */ -#elif defined (HAVE_REALPATH) && defined (HAVE_UNISTD_H) +#elif defined (RND_HAVE_REALPATH) && defined (RND_HAVE_UNISTD_H) { #ifdef inline /* Suppress compiler warnings; -Dinline means we are compiling in @@ -126,7 +126,7 @@ } return NULL; } - /* HAVE_REALPATH && HAVE_UNISTD_H */ + /* RND_HAVE_REALPATH && RND_HAVE_UNISTD_H */ /* The MS Windows method. If we don't have realpath, we assume we don't have symlinks and just canonicalize to a Windows absolute Index: trunk/src/librnd/core/compat_misc.c =================================================================== --- trunk/src/librnd/core/compat_misc.c (revision 30915) +++ trunk/src/librnd/core/compat_misc.c (revision 30916) @@ -54,7 +54,7 @@ const char *pcb_get_user_name(void) { -#ifdef HAVE_GETPWUID +#ifdef RND_HAVE_GETPWUID static struct passwd *pwentry; int len; @@ -107,7 +107,7 @@ return o; } -#ifdef HAVE_ROUND +#ifdef RND_HAVE_ROUND #undef round extern double round(double x); double pcb_round(double x) Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 30915) +++ trunk/src/librnd/core/conf.c (revision 30916) @@ -471,7 +471,7 @@ /* replace pcb name with project_name and test */ strncpy(res, pcb_fn, sizeof(res)-1); res[sizeof(res)-1] = '\0'; - end = strrchr(res, PCB_DIR_SEPARATOR_C); + end = strrchr(res, RND_DIR_SEPARATOR_C); if (end != NULL) { if (end+1+sizeof(project_name) >= res + sizeof(res)) return NULL; Index: trunk/src/librnd/core/globalconst.h =================================================================== --- trunk/src/librnd/core/globalconst.h (revision 30915) +++ trunk/src/librnd/core/globalconst.h (revision 30916) @@ -31,7 +31,7 @@ #include -#define PCB_LARGE_VALUE (COORD_MAX / 2 - 1) /* maximum extent of board and elements */ +#define PCB_LARGE_VALUE (RND_COORD_MAX / 2 - 1) /* maximum extent of board and elements */ #define PCB_MAX_COORD ((rnd_coord_t)PCB_LARGE_VALUE) /* coordinate limits */ #define PCB_MIN_SIZE 0 Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 30915) +++ trunk/src/librnd/core/hid_init.c (revision 30916) @@ -90,34 +90,34 @@ pcb_render = pcb_gui = pcb_hid_nogui_get_hid(); TODO("make this configurable - add to conf_board_ignores avoid plugin injection") - tmp = pcb_concat(pcbhl_conf.rc.path.exec_prefix, PCB_DIR_SEPARATOR_S, "lib", PCB_DIR_SEPARATOR_S, "pcb-rnd", PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); + tmp = pcb_concat(pcbhl_conf.rc.path.exec_prefix, RND_DIR_SEPARATOR_S, "lib", RND_DIR_SEPARATOR_S, "pcb-rnd", RND_DIR_SEPARATOR_S, "plugins", RND_DIR_SEPARATOR_S, HOST, NULL); pcb_plugin_add_dir(tmp); free(tmp); - tmp = pcb_concat(pcbhl_conf.rc.path.exec_prefix, PCB_DIR_SEPARATOR_S, "lib", PCB_DIR_SEPARATOR_S, "pcb-rnd", PCB_DIR_SEPARATOR_S, "plugins", NULL); + tmp = pcb_concat(pcbhl_conf.rc.path.exec_prefix, RND_DIR_SEPARATOR_S, "lib", RND_DIR_SEPARATOR_S, "pcb-rnd", RND_DIR_SEPARATOR_S, "plugins", NULL); pcb_plugin_add_dir(tmp); free(tmp); /* hardwired libdir, just in case exec-prefix goes wrong (e.g. linstall) */ - tmp = pcb_concat(pcbhl_conf_lib_dir, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); + tmp = pcb_concat(pcbhl_conf_lib_dir, RND_DIR_SEPARATOR_S, "plugins", RND_DIR_SEPARATOR_S, HOST, NULL); pcb_plugin_add_dir(tmp); free(tmp); - tmp = pcb_concat(pcbhl_conf_lib_dir, PCB_DIR_SEPARATOR_S, "plugins", NULL); + tmp = pcb_concat(pcbhl_conf_lib_dir, RND_DIR_SEPARATOR_S, "plugins", NULL); pcb_plugin_add_dir(tmp); free(tmp); /* pcbhl_conf.rc.path.home is set by the conf_core immediately on startup */ if (pcbhl_conf.rc.path.home != NULL) { - tmp = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, pcbhl_conf_dot_dir, PCB_DIR_SEPARATOR_S, "plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); + tmp = pcb_concat(pcbhl_conf.rc.path.home, RND_DIR_SEPARATOR_S, pcbhl_conf_dot_dir, RND_DIR_SEPARATOR_S, "plugins", RND_DIR_SEPARATOR_S, HOST, NULL); pcb_plugin_add_dir(tmp); free(tmp); - tmp = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, pcbhl_conf_dot_dir, PCB_DIR_SEPARATOR_S, "plugins", NULL); + tmp = pcb_concat(pcbhl_conf.rc.path.home, RND_DIR_SEPARATOR_S, pcbhl_conf_dot_dir, RND_DIR_SEPARATOR_S, "plugins", NULL); pcb_plugin_add_dir(tmp); free(tmp); } - tmp = pcb_concat("plugins", PCB_DIR_SEPARATOR_S, HOST, NULL); + tmp = pcb_concat("plugins", RND_DIR_SEPARATOR_S, HOST, NULL); pcb_plugin_add_dir(tmp); free(tmp); @@ -277,7 +277,7 @@ const char *pcb_hid_export_fn(const char *filename) { if (pcbhl_conf.rc.export_basename) { - const char *outfn = strrchr(filename, PCB_DIR_SEPARATOR_C); + const char *outfn = strrchr(filename, RND_DIR_SEPARATOR_C); if (outfn == NULL) return filename; return outfn + 1; Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 30915) +++ trunk/src/librnd/core/safe_fs.c (revision 30916) @@ -282,7 +282,7 @@ FILE *res; /* try the trivial: directly under this dir */ - pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, PCB_DIR_SEPARATOR_C, fn); + pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, RND_DIR_SEPARATOR_C, fn); res = pcb_fopen(hidlib, tmp, mode); if (res != NULL) { @@ -303,7 +303,7 @@ struct stat st; if (de->d_name[0] == '.') continue; - pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, PCB_DIR_SEPARATOR_C, de->d_name); + pcb_snprintf(tmp, sizeof(tmp), "%s%c%s", from, RND_DIR_SEPARATOR_C, de->d_name); if (stat(tmp, &st) != 0) continue; if (!S_ISDIR(st.st_mode)) Index: trunk/src/librnd/core/unit.c =================================================================== --- trunk/src/librnd/core/unit.c (revision 30915) +++ trunk/src/librnd/core/unit.c (revision 30916) @@ -183,10 +183,10 @@ switch(unit->family) { case PCB_UNIT_METRIC: case PCB_UNIT_IMPERIAL: - if (res >= (double)COORD_MAX) - return COORD_MAX; - if (res <= -1.0 * (double)COORD_MAX) - return -COORD_MAX; + if (res >= (double)RND_COORD_MAX) + return RND_COORD_MAX; + if (res <= -1.0 * (double)RND_COORD_MAX) + return -RND_COORD_MAX; break; case PCB_UNIT_FREQ: break; Index: trunk/src/librnd/pcb_compat.h =================================================================== --- trunk/src/librnd/pcb_compat.h (revision 30915) +++ trunk/src/librnd/pcb_compat.h (revision 30916) @@ -121,9 +121,47 @@ #define pcb_distance rnd_distance #define pcb_cardinal_t rnd_cardinal_t #define PCB_INLINE RND_INLINE -#define PCB_FUNC_UNUSED RND_FUNC_UNUSED #define PCB_HAVE_SETENV RND_HAVE_SETENV #define PCB_HAVE_PUTENV RND_HAVE_PUTENV #define PCB_HAVE_USLEEP RND_HAVE_USLEEP #define PCB_HAVE_WSLEEP RND_HAVE_WSLEEP #define PCB_HAVE_SELECT RND_HAVE_SELECT +#define HAVE_SNPRINTF RND_HAVE_SNPRINTF +#define HAVE_VSNPRINTF RND_HAVE_VSNPRINTF +#define HAVE_GETCWD RND_HAVE_GETCWD +#define HAVE__GETCWD RND_HAVE__GETCWD +#define HAVE_GETWD RND_HAVE_GETWD +#define HAVE_GD_H RND_HAVE_GD_H +#define HAVE_GDIMAGEGIF RND_HAVE_GDIMAGEGIF +#define HAVE_GDIMAGEJPEG RND_HAVE_GDIMAGEJPEG +#define HAVE_GDIMAGEPNG RND_HAVE_GDIMAGEPNG +#define HAVE_GD_RESOLUTION RND_HAVE_GD_RESOLUTION +#define HAVE_GETPWUID RND_HAVE_GETPWUID +#define HAVE_RINT RND_HAVE_RINT +#define HAVE_ROUND RND_HAVE_ROUND +#define WRAP_S_ISLNK RND_WRAP_S_ISLNK +#define HAVE_XINERAMA RND_HAVE_XINERAMA +#define HAVE_XRENDER RND_HAVE_XRENDER +#define USE_LOADLIBRARY RND_USE_LOADLIBRARY +#define HAVE_MKDTEMP RND_HAVE_MKDTEMP +#define HAVE_REALPATH RND_HAVE_REALPATH +#define USE_FORK_WAIT RND_USE_FORK_WAIT +#define USE_SPAWNVP RND_USE_SPAWNVP +#define USE_MKDIR RND_USE_MKDIR +#define USE__MKDIR RND_USE__MKDIR +#define MKDIR_NUM_ARGS RND_MKDIR_NUM_ARGS +#define PCB_HAVE_SIGPIPE RND_HAVE_SIGPIPE +#define PCB_HAVE_SIGSEGV RND_HAVE_SIGSEGV +#define PCB_HAVE_SIGABRT RND_HAVE_SIGABRT +#define PCB_HAVE_SIGINT RND_HAVE_SIGINT +#define PCB_HAVE_SIGHUP RND_HAVE_SIGHUP +#define PCB_HAVE_SIGTERM RND_HAVE_SIGTERM +#define PCB_HAVE_SIGQUIT RND_HAVE_SIGQUIT +#define PCB_HAVE_SYS_FUNGW RND_HAVE_SYS_FUNGW +#define PCB_DIR_SEPARATOR_C RND_DIR_SEPARATOR_C +#define PCB_DIR_SEPARATOR_S RND_DIR_SEPARATOR_S +#define PCB_PATH_DELIMETER RND_PATH_DELIMETER +#define HAS_ATEXIT RND_HAS_ATEXIT +#define HAVE_UNISTD_H RND_HAVE_UNISTD_H +#define COORD_MAX RND_COORD_MAX +#define PCB_FUNC_UNUSED RND_FUNC_UNUSED Index: trunk/src/librnd/poly/polyarea.c =================================================================== --- trunk/src/librnd/poly/polyarea.c (revision 30915) +++ trunk/src/librnd/poly/polyarea.c (revision 30916) @@ -2259,8 +2259,8 @@ if (c->head == NULL) c->head = calloc(sizeof(pcb_vnode_t), 1); c->head->next = c->head->prev = c->head; - c->xmin = c->ymin = COORD_MAX; - c->xmax = c->ymax = -COORD_MAX-1; + c->xmin = c->ymin = RND_COORD_MAX; + c->xmax = c->ymax = -RND_COORD_MAX-1; c->is_round = pcb_false; c->cx = 0; c->cy = 0; @@ -2622,7 +2622,7 @@ info.f = 0; info.p[0] = ray.X1 = p[0]; info.p[1] = ray.Y1 = p[1]; - ray.X2 = COORD_MAX; + ray.X2 = RND_COORD_MAX; ray.Y2 = p[1] + 1; if (setjmp(info.env) == 0) pcb_r_search(c->tree, &ray, NULL, crossing, &info, NULL); @@ -3042,7 +3042,7 @@ static void pcb_poly_valid_report(pcb_pline_t *c, pcb_vnode_t *pl, pa_chk_res_t *chk) { pcb_vnode_t *v, *n; - rnd_coord_t minx = COORD_MAX, miny = COORD_MAX, maxx = -COORD_MAX, maxy = -COORD_MAX; + rnd_coord_t minx = RND_COORD_MAX, miny = RND_COORD_MAX, maxx = -RND_COORD_MAX, maxy = -RND_COORD_MAX; #define update_minmax(min, max, val) \ if (val < min) min = val; \ @@ -3482,7 +3482,7 @@ /* ray to the right */ bx.X1 = cx + r; - bx.X2 = COORD_MAX; + bx.X2 = RND_COORD_MAX; cnt = 0; pcb_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL); if ((cnt % 2) == 0) @@ -3489,7 +3489,7 @@ return pcb_false; /* ray to the right */ - bx.X1 = -COORD_MAX; + bx.X1 = -RND_COORD_MAX; bx.X2 = cx - r; cnt = 0; pcb_r_search(pl->tree, &bx, NULL, pline_embraces_circ_cb, &cnt, NULL); Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 30915) +++ trunk/src/main.c (revision 30916) @@ -105,7 +105,7 @@ something like /usr/local/bin/pcb or ./pcb or ./foo/pcb but if you just use pcb and it exists in your path, you'll just get back pcb again. */ - haspath = (strchr(argv0, PCB_DIR_SEPARATOR_C) != NULL); + haspath = (strchr(argv0, RND_DIR_SEPARATOR_C) != NULL); #ifdef DEBUG printf("main_path_init (%s): haspath = %d\n", argv0, haspath); @@ -126,7 +126,7 @@ path = pcb_strdup(tmps); /* search through the font path for a font file */ - for (p = strtok(path, PCB_PATH_DELIMETER); p && *p; p = strtok(NULL, PCB_PATH_DELIMETER)) { + for (p = strtok(path, RND_PATH_DELIMETER); p && *p; p = strtok(NULL, RND_PATH_DELIMETER)) { #ifdef DEBUG printf("Looking for %s in %s\n", argv0, p); #endif @@ -134,7 +134,7 @@ fprintf(stderr, "main_path_init(): malloc failed\n"); exit(1); } - sprintf(tmps, "%s%s%s", p, PCB_DIR_SEPARATOR_S, argv0); + sprintf(tmps, "%s%s%s", p, RND_DIR_SEPARATOR_S, argv0); r = stat(tmps, &sb); if (r == 0) { #ifdef DEBUG @@ -154,10 +154,10 @@ if (found_bindir) { /* strip off the executable name leaving only the path */ t2 = NULL; - t1 = strchr(bindir, PCB_DIR_SEPARATOR_C); + t1 = strchr(bindir, RND_DIR_SEPARATOR_C); while (t1 != NULL && *t1 != '\0') { t2 = t1; - t1 = strchr(t2 + 1, PCB_DIR_SEPARATOR_C); + t1 = strchr(t2 + 1, RND_DIR_SEPARATOR_C); } if (t2 != NULL) *t2 = '\0'; @@ -173,7 +173,7 @@ fprintf(stderr, "main_path_init(): malloc failed\n"); exit(1); } - sprintf(exec_prefix, "%s%s%s", bindir, PCB_DIR_SEPARATOR_S, BINDIR_TO_EXECPREFIX); + sprintf(exec_prefix, "%s%s%s", bindir, RND_DIR_SEPARATOR_S, BINDIR_TO_EXECPREFIX); /* export the most important paths and data for child processes (e.g. parametric footprints) */ tmp = pcb_concat(PCBSHAREDIR, "/pcblib", NULL); @@ -214,31 +214,31 @@ /* initialize signal and error handlers */ static void main_sighand_init(void) { -#ifdef PCB_HAVE_SIGHUP +#ifdef RND_HAVE_SIGHUP signal(SIGHUP, pcb_catch_signal); #endif -#ifdef PCB_HAVE_SIGQUIT +#ifdef RND_HAVE_SIGQUIT signal(SIGQUIT, pcb_catch_signal); #endif -#ifdef PCB_HAVE_SIGTERM +#ifdef RND_HAVE_SIGTERM signal(SIGTERM, pcb_catch_signal); #endif -#ifdef PCB_HAVE_SIGINT +#ifdef RND_HAVE_SIGINT signal(SIGINT, pcb_catch_signal); #endif #ifdef NDEBUG /* so that we get a core dump on segfault in debug mode */ -# ifdef PCB_HAVE_SIGABRT +# ifdef RND_HAVE_SIGABRT signal(SIGABRT, pcb_catch_signal); # endif -# ifdef PCB_HAVE_SIGSEGV +# ifdef RND_HAVE_SIGSEGV signal(SIGSEGV, pcb_catch_signal); # endif #endif /* calling external program by popen() may cause a PIPE signal, so we ignore it */ -#ifdef PCB_HAVE_SIGPIPE +#ifdef RND_HAVE_SIGPIPE signal(SIGPIPE, SIG_IGN); #endif } Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 30915) +++ trunk/src/plug_io.c (revision 30916) @@ -127,7 +127,7 @@ return; } - end = strrchr(last_design_dir, PCB_DIR_SEPARATOR_C); + end = strrchr(last_design_dir, RND_DIR_SEPARATOR_C); if (end != NULL) *end = '\0'; @@ -676,7 +676,7 @@ return (pcb_pclose(fp) ? (-1) : result); } -#if !defined(HAS_ATEXIT) +#if !defined(RND_HAS_ATEXIT) static char *TMPFilename = NULL; #endif Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 30915) +++ trunk/src_plugins/cam/cam.c (revision 30916) @@ -55,7 +55,7 @@ { if ((PCB != NULL) && (PCB->hidlib.filename != NULL)) { char *fn = pcb_derive_default_filename_(PCB->hidlib.filename, ""); - char *val, *end = strrchr(fn, PCB_DIR_SEPARATOR_C); + char *val, *end = strrchr(fn, RND_DIR_SEPARATOR_C); if (end != NULL) val = pcb_strdup(end+1); else @@ -119,7 +119,7 @@ if (dirlen > 0) { ctx->prefix = malloc(dirlen+2); memcpy(ctx->prefix, optval, dirlen); - ctx->prefix[dirlen] = PCB_DIR_SEPARATOR_C; + ctx->prefix[dirlen] = RND_DIR_SEPARATOR_C; ctx->prefix[dirlen+1] = '\0'; } else Index: trunk/src_plugins/cam/cam_compile.c =================================================================== --- trunk/src_plugins/cam/cam_compile.c (revision 30915) +++ trunk/src_plugins/cam/cam_compile.c (revision 30916) @@ -43,7 +43,7 @@ int res; /* mkdir -p if there's a path sep in the prefix */ - end = strrchr(arg, PCB_DIR_SEPARATOR_C); + end = strrchr(arg, RND_DIR_SEPARATOR_C); if (end == NULL) { if (filename != NULL) *filename = arg; @@ -56,12 +56,12 @@ *filename = end+1; for(curr = arg; curr != NULL; curr = next) { - next = strrchr(curr, PCB_DIR_SEPARATOR_C); + next = strrchr(curr, RND_DIR_SEPARATOR_C); if (next != NULL) *next = '\0'; pcb_mkdir(&PCB->hidlib, arg, 0755); if (next != NULL) { - *next = PCB_DIR_SEPARATOR_C; + *next = RND_DIR_SEPARATOR_C; next++; } } Index: trunk/src_plugins/ddraft/constraint.c =================================================================== --- trunk/src_plugins/ddraft/constraint.c (revision 30915) +++ trunk/src_plugins/ddraft/constraint.c (revision 30916) @@ -88,7 +88,7 @@ if (lengthlen > 0) { /* find the best matching constraint length */ best = -1; - best_diff = COORD_MAX; + best_diff = RND_COORD_MAX; for(n = 0; n < lengthlen; n++) { diff = fabs(len - lengths[n]); if (diff < best_diff) { Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30915) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 30916) @@ -146,7 +146,7 @@ /* find and truncate extension */ for (s = fn + strlen(fn) - 1; *s != '.'; s--) { - if ((s <= fn) || (*s == PCB_DIR_SEPARATOR_C)) { + if ((s <= fn) || (*s == RND_DIR_SEPARATOR_C)) { free(fn); return; } @@ -154,7 +154,7 @@ *s = '\0'; /* calculate basename in bn */ - bn = strrchr(fn, PCB_DIR_SEPARATOR_C); + bn = strrchr(fn, RND_DIR_SEPARATOR_C); if (bn == NULL) bn = fn; else Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 30915) +++ trunk/src_plugins/export_png/png.c (revision 30916) @@ -145,17 +145,17 @@ #undef HAVE_SOME_FORMAT static const char *filetypes[] = { -#ifdef HAVE_GDIMAGEPNG +#ifdef RND_HAVE_GDIMAGEPNG FMT_png, #define HAVE_SOME_FORMAT 1 #endif -#ifdef HAVE_GDIMAGEGIF +#ifdef RND_HAVE_GDIMAGEGIF FMT_gif, #define HAVE_SOME_FORMAT 1 #endif -#ifdef HAVE_GDIMAGEJPEG +#ifdef RND_HAVE_GDIMAGEJPEG FMT_jpg, #define HAVE_SOME_FORMAT 1 #endif @@ -499,19 +499,19 @@ if (fmt == NULL) format_error = pcb_true; else if (strcmp(fmt, FMT_gif) == 0) -#ifdef HAVE_GDIMAGEGIF +#ifdef RND_HAVE_GDIMAGEGIF gdImageGif(im, f); #else format_error = pcb_true; #endif else if (strcmp(fmt, FMT_jpg) == 0) -#ifdef HAVE_GDIMAGEJPEG +#ifdef RND_HAVE_GDIMAGEJPEG gdImageJpeg(im, f, -1); #else format_error = pcb_true; #endif else if (strcmp(fmt, FMT_png) == 0) -#ifdef HAVE_GDIMAGEPNG +#ifdef RND_HAVE_GDIMAGEPNG gdImagePng(im, f); #else format_error = pcb_true; @@ -707,7 +707,7 @@ return; } -#ifdef HAVE_GD_RESOLUTION +#ifdef RND_HAVE_GD_RESOLUTION gdImageSetResolution(im, dpi, dpi); #endif Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c =================================================================== --- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 30915) +++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 30916) @@ -244,7 +244,7 @@ /* pwd is lost during daemonisation */ if (!pcb_is_path_abs(PCB->hidlib.filename)) - fn = pcb_strdup_printf("%s%c%s", fuse_cwd, PCB_DIR_SEPARATOR_C, PCB->hidlib.filename); + fn = pcb_strdup_printf("%s%c%s", fuse_cwd, RND_DIR_SEPARATOR_C, PCB->hidlib.filename); if (pcb_save_pcb(fn, NULL) != 0) { fprintf(stderr, "Failed to save the modified board file\n"); Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 30915) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 30916) @@ -103,7 +103,7 @@ *end = ':'; end++; } else { - *end = PCB_DIR_SEPARATOR_C; end++; + *end = RND_DIR_SEPARATOR_C; end++; } memcpy(end, name, nl+1); end += nl; } @@ -151,7 +151,7 @@ l = strlen(new_subdir); memcpy(fn, new_subdir, l); - fn[l] = PCB_DIR_SEPARATOR_C; + fn[l] = RND_DIR_SEPARATOR_C; fn[l+1] = '\0'; fn_end = fn + l + 1; @@ -191,7 +191,7 @@ /* printf("... Found a footprint %s ... \n", subdirentry->d_name); */ #endif strcpy(fn_end, subdirentry->d_name); - if ((S_ISREG(buffer.st_mode)) || (WRAP_S_ISLNK(buffer.st_mode))) { + if ((S_ISREG(buffer.st_mode)) || (RND_WRAP_S_ISLNK(buffer.st_mode))) { pcb_plug_fp_map_t head = {0}, *res; res = pcb_io_map_footprint_file(&PCB->hidlib, subdirentry->d_name, &head, need_tags); if (res->libtype == PCB_LIB_DIR) { @@ -212,7 +212,7 @@ } } - if ((S_ISDIR(buffer.st_mode)) || (WRAP_S_ISLNK(buffer.st_mode))) { + if ((S_ISDIR(buffer.st_mode)) || (RND_WRAP_S_ISLNK(buffer.st_mode))) { cb(cookie, new_subdir, subdirentry->d_name, PCB_FP_DIR, NULL, NULL); if (recurse) { n_footprints += fp_fs_list(pl, fn, recurse, cb, cookie, 0, need_tags); @@ -237,7 +237,7 @@ const char *visible_subdir; char *working; /* String holding abs path to working dir */ - sprintf(working_, "%s%c%s", toppath, PCB_DIR_SEPARATOR_C, subdir); + sprintf(working_, "%s%c%s", toppath, RND_DIR_SEPARATOR_C, subdir); pcb_path_resolve(&PCB->hidlib, working_, &working, 0, pcb_false); /* Return error if the root is not a directory, to give other fp_ plugins a chance */ @@ -356,7 +356,7 @@ fp_fs_list(&pcb_library, fpath, 1, fp_search_cb, &ctx, 1, 0); if (ctx.path != NULL) { - sprintf(path, "%s%c%s", ctx.path, PCB_DIR_SEPARATOR_C, ctx.real_name); + sprintf(path, "%s%c%s", ctx.path, RND_DIR_SEPARATOR_C, ctx.real_name); free(ctx.path); free(ctx.real_name); /* fprintf(" found '%s'\n", path);*/ Index: trunk/src_plugins/fp_wget/edakrill.c =================================================================== --- trunk/src_plugins/fp_wget/edakrill.c (revision 30915) +++ trunk/src_plugins/fp_wget/edakrill.c (revision 30916) @@ -146,7 +146,7 @@ if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0) return -1; - pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" PCB_DIR_SEPARATOR_S "edakrill.last", conf_fp_wget.plugins.fp_wget.cache_dir); + pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" RND_DIR_SEPARATOR_S "edakrill.last", conf_fp_wget.plugins.fp_wget.cache_dir); gds_init(&vpath); gds_append_str(&vpath, REQUIRE_PATH_PREFIX); Index: trunk/src_plugins/fp_wget/gedasymbols.c =================================================================== --- trunk/src_plugins/fp_wget/gedasymbols.c (revision 30915) +++ trunk/src_plugins/fp_wget/gedasymbols.c (revision 30916) @@ -67,7 +67,7 @@ if (strncmp(path, REQUIRE_PATH_PREFIX, strlen(REQUIRE_PATH_PREFIX)) != 0) return -1; - pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" PCB_DIR_SEPARATOR_S "gedasymbols.last", conf_fp_wget.plugins.fp_wget.cache_dir); + pcb_snprintf(last_sum_fn, sizeof(last_sum_fn), "%s" RND_DIR_SEPARATOR_S "gedasymbols.last", conf_fp_wget.plugins.fp_wget.cache_dir); gds_init(&vpath); gds_append_str(&vpath, REQUIRE_PATH_PREFIX); Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 30915) +++ trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 30916) @@ -66,10 +66,10 @@ { XmString xms_path; - if ((*fn != PCB_DIR_SEPARATOR_C) && (append)) { + if ((*fn != RND_DIR_SEPARATOR_C) && (append)) { char *end, *path, *dir = pcb_ltf_get_path(pctx); - end = strrchr(dir, PCB_DIR_SEPARATOR_C); + end = strrchr(dir, RND_DIR_SEPARATOR_C); if (end == NULL) { path = pcb_concat(dir, "/", fn, NULL); } Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 30915) +++ trunk/src_plugins/hid_lesstif/main.c (revision 30916) @@ -108,12 +108,12 @@ static Pixmap mask_bitmap = 0; /* 'Sketch transparency bitmap' for compositing: tells which pixels shall be copied and which one are transparent/erased */ static int use_xrender = 0; -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER static Picture main_picture; static Picture mask_picture; static Pixmap pale_pixmap; static Picture pale_picture; -#endif /* HAVE_XRENDER */ +#endif /* RND_HAVE_XRENDER */ static int pixmap_w = 0, pixmap_h = 0; Screen *screen_s; @@ -615,7 +615,7 @@ Pixmap mask_scaled; char *img_data; -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER Picture p_img_scaled; Picture p_mask_scaled; #endif @@ -734,7 +734,7 @@ lpm->pm_scaled = 0; } -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER if (use_xrender) { if (lpm->p_img_scaled != 0) XRenderFreePicture(display, lpm->p_img_scaled); @@ -750,7 +750,7 @@ #endif } -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER if (use_xrender) { fprintf(stderr, "clip xrender\n"); XRenderPictureAttributes pa; @@ -1251,7 +1251,7 @@ if (mask_pixmap) XFreePixmap(display, mask_pixmap); mask_pixmap = XCreatePixmap(display, window, width, height, XDefaultDepth(display, screen)); -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER if (main_picture) { XRenderFreePicture(display, main_picture); main_picture = 0; @@ -1266,7 +1266,7 @@ if (!main_picture || !mask_picture) use_xrender = 0; } -#endif /* HAVE_XRENDER */ +#endif /* RND_HAVE_XRENDER */ if (mask_bitmap) XFreePixmap(display, mask_bitmap); @@ -1329,7 +1329,7 @@ work_area_make_pixmaps(width, height); -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER if (use_xrender) { double l_alpha = pcbhl_conf.appearance.layer_alpha; XRenderPictureAttributes pa; @@ -1349,7 +1349,7 @@ else use_xrender = 0; } -#endif /* HAVE_XRENDER */ +#endif /* RND_HAVE_XRENDER */ clip_gc = XCreateGC(display, window, 0, 0); pxm_clip_gc = XCreateGC(display, window, 0, 0); @@ -1800,16 +1800,16 @@ XtGetApplicationResources(appwidget, new_values, new_resources, rmax, 0, 0); -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER use_xrender = XRenderQueryExtension(display, &render_event, &render_error) && XRenderFindVisualFormat(display, DefaultVisual(display, screen)); -#ifdef HAVE_XINERAMA +#ifdef RND_HAVE_XINERAMA /* Xinerama and XRender don't get along well */ if (XineramaQueryExtension(display, &render_event, &render_error) && XineramaIsActive(display)) use_xrender = 0; -#endif /* HAVE_XINERAMA */ -#endif /* HAVE_XRENDER */ +#endif /* RND_HAVE_XINERAMA */ +#endif /* RND_HAVE_XRENDER */ rcount = 0; for (ha = hid_attr_nodes; ha; ha = ha->next) @@ -2217,7 +2217,7 @@ pixmap = main_pixmap; /* blit back the result */ -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER if (use_xrender) { XRenderPictureAttributes pa; @@ -2227,7 +2227,7 @@ main_picture, 0, 0, 0, 0, 0, 0, view_width, view_height); } else -#endif /* HAVE_XRENDER */ +#endif /* RND_HAVE_XRENDER */ { XSetClipMask(display, clip_gc, mask_bitmap); XCopyArea(display, mask_pixmap, main_pixmap, clip_gc, 0, 0, view_width, view_height, 0, 0); Index: trunk/src_plugins/hid_lesstif/xincludes.h =================================================================== --- trunk/src_plugins/hid_lesstif/xincludes.h (revision 30915) +++ trunk/src_plugins/hid_lesstif/xincludes.h (revision 30916) @@ -35,12 +35,12 @@ #include #include -#ifdef HAVE_XRENDER +#ifdef RND_HAVE_XRENDER #include -#endif /* HAVE_XRENDER */ +#endif /* RND_HAVE_XRENDER */ -#ifdef HAVE_XINERAMA +#ifdef RND_HAVE_XINERAMA #include -#endif /* HAVE_XINERAMA */ +#endif /* RND_HAVE_XINERAMA */ #undef Mask Index: trunk/src_plugins/import_pxm_gd/import_pxm_gd.c =================================================================== --- trunk/src_plugins/import_pxm_gd/import_pxm_gd.c (revision 30915) +++ trunk/src_plugins/import_pxm_gd/import_pxm_gd.c (revision 30916) @@ -87,7 +87,7 @@ return (gdi == NULL); } -#ifdef HAVE_GDIMAGEPNG +#ifdef RND_HAVE_GDIMAGEPNG static int gd_png_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn) { return gd_load(hidlib, pxm, fn, gdImageCreateFromPng); @@ -99,7 +99,7 @@ }; #endif -#ifdef HAVE_GDIMAGEJPEG +#ifdef RND_HAVE_GDIMAGEJPEG static int gd_jpg_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn) { return gd_load(hidlib, pxm, fn, gdImageCreateFromJpeg); @@ -111,7 +111,7 @@ }; #endif -#ifdef HAVE_GDIMAGEGIF +#ifdef RND_HAVE_GDIMAGEGIF static int gd_gif_load(rnd_hidlib_t *hidlib, pcb_pixmap_t *pxm, const char *fn) { return gd_load(hidlib, pxm, fn, gdImageCreateFromGif); @@ -134,13 +134,13 @@ { PCB_API_CHK_VER; -#ifdef HAVE_GDIMAGEPNG +#ifdef RND_HAVE_GDIMAGEPNG pcb_pixmap_reg_import(&pxm_gd_png_imp, import_pxm_gd_cookie); #endif -#ifdef HAVE_GDIMAGEJPEG +#ifdef RND_HAVE_GDIMAGEJPEG pcb_pixmap_reg_import(&pxm_gd_jpg_imp, import_pxm_gd_cookie); #endif -#ifdef HAVE_GDIMAGEGIF +#ifdef RND_HAVE_GDIMAGEGIF pcb_pixmap_reg_import(&pxm_gd_gif_imp, import_pxm_gd_cookie); #endif return 0; Index: trunk/src_plugins/io_mentor_cell/read.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read.c (revision 30915) +++ trunk/src_plugins/io_mentor_cell/read.c (revision 30916) @@ -1415,7 +1415,7 @@ /* create the file name for the padstacks */ strncpy(fn2, fn, PCB_PATH_MAX); fn2[PCB_PATH_MAX-1] = '\0'; - end = strrchr(fn2, PCB_DIR_SEPARATOR_C); + end = strrchr(fn2, RND_DIR_SEPARATOR_C); if (end == NULL) end = fn2; else Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 30915) +++ trunk/src_plugins/io_pcb/file.c (revision 30916) @@ -1185,7 +1185,7 @@ pcb_rat_all_anchor_guess(pcb->Data); } -#if !defined(HAS_ATEXIT) +#if !defined(RND_HAS_ATEXIT) /* makes a temporary copy of the data. This is useful for systems which * doesn't support calling functions on exit. We use this to save the data * before LEX and YACC functions are called because they are able to abort Index: trunk/src_plugins/io_pcb/file.h =================================================================== --- trunk/src_plugins/io_pcb/file.h (revision 30915) +++ trunk/src_plugins/io_pcb/file.h (revision 30916) @@ -90,7 +90,7 @@ void io_pcb_preproc_board(pcb_board_t *pcb); void io_pcb_postproc_board(pcb_board_t *pcb); -#ifndef HAS_ATEXIT +#ifndef RND_HAS_ATEXIT void pcb_tmp_data_save(void); void pcb_tmp_data_remove(void); #endif Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 30915) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 30916) @@ -2618,7 +2618,7 @@ } if (Path != NULL && *Path != '\0') - sprintf(tmps, "%s%s%s", Path, PCB_DIR_SEPARATOR_S, Filename); + sprintf(tmps, "%s%s%s", Path, RND_DIR_SEPARATOR_S, Filename); else sprintf(tmps, "%s", Filename); @@ -2669,7 +2669,7 @@ pcb_create_be_lenient(pcb_true); -#if !defined(HAS_ATEXIT) +#if !defined(RND_HAS_ATEXIT) if (PCB && PCB->Data) pcb_tmp_data_save(); returncode = pcb_parse(); Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 30915) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 30916) @@ -235,7 +235,7 @@ } if (Path != NULL && *Path != '\0') - sprintf(tmps, "%s%s%s", Path, PCB_DIR_SEPARATOR_S, Filename); + sprintf(tmps, "%s%s%s", Path, RND_DIR_SEPARATOR_S, Filename); else sprintf(tmps, "%s", Filename); @@ -286,7 +286,7 @@ pcb_create_be_lenient(pcb_true); -#if !defined(HAS_ATEXIT) +#if !defined(RND_HAS_ATEXIT) if (PCB && PCB->Data) pcb_tmp_data_save(); returncode = pcb_parse(); Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 30915) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 30916) @@ -43,8 +43,8 @@ min_zoom = 200; /* max zoom is calculated so that zoom * canvas_size * 2 doesn't overflow rnd_coord_t */ - max_zoom_w = (double)COORD_MAX / (double)vw->canvas_width; - max_zoom_h = (double)COORD_MAX / (double)vw->canvas_height; + max_zoom_w = (double)RND_COORD_MAX / (double)vw->canvas_width; + max_zoom_h = (double)RND_COORD_MAX / (double)vw->canvas_height; max_zoom = MIN(max_zoom_w, max_zoom_h) / 2.0; out_zoom = coord_per_px; @@ -134,7 +134,7 @@ /* Do not allow zoom level that'd overflow the coord type */ cmaxx = v->canvas_width * (new_zoom / 2.0); cmaxy = v->canvas_height * (new_zoom / 2.0); - if ((cmaxx >= COORD_MAX/2) || (cmaxy >= COORD_MAX/2)) { + if ((cmaxx >= RND_COORD_MAX/2) || (cmaxy >= RND_COORD_MAX/2)) { return; } Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 30915) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 30916) @@ -105,7 +105,7 @@ pcb_mkdir(hidlib, cachedir, 0755); wopts.post_file = "/dev/null"; - path = pcb_strdup_printf("%s%cGetCountry", cachedir, PCB_DIR_SEPARATOR_C); + path = pcb_strdup_printf("%s%cGetCountry", cachedir, RND_DIR_SEPARATOR_C); if (pcbway_cahce_update_(hidlib, SERVER "/api/Address/GetCountry", path, 0, &wopts) != 0) { res = -1; goto quit; @@ -112,7 +112,7 @@ } free(path); - path = pcb_strdup_printf("%s%cPCBWay_Api.xml", cachedir, PCB_DIR_SEPARATOR_C); + path = pcb_strdup_printf("%s%cPCBWay_Api.xml", cachedir, RND_DIR_SEPARATOR_C); if (pcbway_cahce_update_(hidlib, SERVER "/xml/PCBWay_Api.xml", path, 1, NULL) != 0) { res = -1; goto quit; @@ -293,13 +293,13 @@ } cachedir = pcb_build_fn(&PCB->hidlib, conf_order.plugins.order.cache); - path = pcb_strdup_printf("%s%cPCBWay_Api.xml", cachedir, PCB_DIR_SEPARATOR_C); + path = pcb_strdup_printf("%s%cPCBWay_Api.xml", cachedir, RND_DIR_SEPARATOR_C); doc = pcbway_xml_load(path); if (doc != NULL) { root = xmlDocGetRootElement(doc); if ((root != NULL) && (xmlStrcmp(root->name, (xmlChar *)"PCBWayAPI") == 0)) { octx->odata = calloc(sizeof(pcbway_form_t), 1); - country_fn = pcb_strdup_printf("%s%cGetCountry", cachedir, PCB_DIR_SEPARATOR_C); + country_fn = pcb_strdup_printf("%s%cGetCountry", cachedir, RND_DIR_SEPARATOR_C); if (pcbway_load_countries(octx->odata, country_fn) != 0) res = -1; else if (pcbway_load_fields_(&PCB->hidlib, imp, octx, root) != 0) { Index: trunk/src_plugins/propedit/props.c =================================================================== --- trunk/src_plugins/propedit/props.c (revision 30915) +++ trunk/src_plugins/propedit/props.c (revision 30916) @@ -193,7 +193,7 @@ case PCB_PROPT_invalid: break; case PCB_PROPT_max: break; case PCB_PROPT_STRING: break; - case PCB_PROPT_COORD: minp.coord = COORD_MAX; maxp.coord = -minp.coord; break; + case PCB_PROPT_COORD: minp.coord = RND_COORD_MAX; maxp.coord = -minp.coord; break; case PCB_PROPT_ANGLE: minp.angle = 100000; maxp.angle = -minp.angle; break; case PCB_PROPT_INT: minp.i = INT_MAX; maxp.i = -minp.i; break; case PCB_PROPT_BOOL: minp.i = 1; maxp.i = 0; break; Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 30915) +++ trunk/src_plugins/script/live_script.c (revision 30916) @@ -93,7 +93,7 @@ free(lvs); } -#ifdef PCB_HAVE_SYS_FUNGW +#ifdef RND_HAVE_SYS_FUNGW static int lvs_list_langs(rnd_hidlib_t *hl, live_script_t *lvs) { const char **path; @@ -114,7 +114,7 @@ dirlen = strlen(*path); memcpy(fn, *path, dirlen); fn_end = fn + dirlen; - *fn_end = PCB_DIR_SEPARATOR_C; + *fn_end = RND_DIR_SEPARATOR_C; fn_end++; while((de = pcb_readdir(d)) != NULL) { Index: trunk/src_plugins/script/perma.c =================================================================== --- trunk/src_plugins/script/perma.c (revision 30915) +++ trunk/src_plugins/script/perma.c (revision 30916) @@ -42,7 +42,7 @@ if (!pcb_is_path_abs(path_in)) { path = spath; - pcb_snprintf(spath, sizeof(spath), "%s%c%s", dir, PCB_DIR_SEPARATOR_C, path_in); + pcb_snprintf(spath, sizeof(spath), "%s%c%s", dir, RND_DIR_SEPARATOR_C, path_in); } else path = path_in; @@ -58,7 +58,7 @@ FILE *f; long succ = 0; - pcb_snprintf(path, sizeof(path), "%s%c%s", dir, PCB_DIR_SEPARATOR_C, "scripts.lht"); + pcb_snprintf(path, sizeof(path), "%s%c%s", dir, RND_DIR_SEPARATOR_C, "scripts.lht"); f = pcb_fopen(NULL, path, "r"); if (f == NULL) return; /* non-existing or unreadable file is no error */ Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 30915) +++ trunk/src_plugins/script/script.c (revision 30916) @@ -46,7 +46,7 @@ #include "script.h" -#ifndef PCB_HAVE_SYS_FUNGW +#ifndef RND_HAVE_SYS_FUNGW int pplg_init_fungw_fawk(void); int pplg_uninit_fungw_fawk(void); #endif @@ -84,15 +84,15 @@ gds_init(&fn); gds_append_str(&fn, pcbhl_conf.rc.path.home); - gds_append(&fn, PCB_DIR_SEPARATOR_C); + gds_append(&fn, RND_DIR_SEPARATOR_C); gds_append_str(&fn, DOT_PCB_RND); pcb_mkdir(NULL, fn.array, 0755); - gds_append(&fn, PCB_DIR_SEPARATOR_C); + gds_append(&fn, RND_DIR_SEPARATOR_C); gds_append_str(&fn, SCRIPT_PERS); pcb_mkdir(NULL, fn.array, 0750); - gds_append(&fn, PCB_DIR_SEPARATOR_C); + gds_append(&fn, RND_DIR_SEPARATOR_C); gds_append_str(&fn, s->obj->name); f = pcb_fopen(NULL, fn.array, "w"); @@ -145,7 +145,7 @@ if (s->obj != NULL) fgw_obj_unreg(&rnd_fgw, s->obj); -#ifdef PCB_HAVE_SYS_FUNGW +#ifdef RND_HAVE_SYS_FUNGW if (s->pup != NULL) pup_unload(&script_pup, s->pup, NULL); #endif @@ -172,7 +172,7 @@ goto err; } - fn = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, DOT_PCB_RND, PCB_DIR_SEPARATOR_S, SCRIPT_PERS, PCB_DIR_SEPARATOR_S, script_persistency_id, NULL); + fn = pcb_concat(pcbhl_conf.rc.path.home, RND_DIR_SEPARATOR_S, DOT_PCB_RND, RND_DIR_SEPARATOR_S, SCRIPT_PERS, RND_DIR_SEPARATOR_S, script_persistency_id, NULL); if (strcmp(cmd, "remove") == 0) { RND_ACT_IRES(pcb_remove(NULL, fn)); @@ -250,7 +250,7 @@ { if (*fn != '~') return pcb_strdup(fn); - return pcb_strdup_printf("%s%c%s", pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_C, fn+1); + return pcb_strdup_printf("%s%c%s", pcbhl_conf.rc.path.home, RND_DIR_SEPARATOR_C, fn+1); } int pcb_script_load(const char *id, const char *fn, const char *lang) @@ -271,7 +271,7 @@ } if (strcmp(lang, "c") != 0) { -#ifdef PCB_HAVE_SYS_FUNGW +#ifdef RND_HAVE_SYS_FUNGW const char *engname = lang; char name[PCB_PATH_MAX]; int st; @@ -439,7 +439,7 @@ htsp_uninit(&scripts); pup_uninit(&script_pup); -#ifndef PCB_HAVE_SYS_FUNGW +#ifndef RND_HAVE_SYS_FUNGW pplg_uninit_fungw_fawk(); #endif } @@ -449,7 +449,7 @@ PCB_API_CHK_VER; RND_REGISTER_ACTIONS(script_action_list, script_cookie); -#ifndef PCB_HAVE_SYS_FUNGW +#ifndef RND_HAVE_SYS_FUNGW pplg_init_fungw_fawk(); #endif Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 30915) +++ trunk/src_plugins/script/script_act.c (revision 30916) @@ -40,7 +40,7 @@ "awk", "mawk", "bas", "fbas", "pas", "fpas", -#ifdef PCB_HAVE_SYS_FUNGW +#ifdef RND_HAVE_SYS_FUNGW "ruby", "mruby", "py", "python", "js", "duktape", @@ -205,7 +205,7 @@ PCB_DAD_LABEL(idlang.dlg, "ID:"); PCB_DAD_STRING(idlang.dlg); idlang.wid = PCB_DAD_CURRENT(idlang.dlg); - tmp = strrchr(fn, PCB_DIR_SEPARATOR_C); + tmp = strrchr(fn, RND_DIR_SEPARATOR_C); if (tmp != NULL) { tmp++; idlang.dlg[idlang.wid].val.str = tmp = pcb_strdup(tmp); @@ -505,7 +505,7 @@ {"pas", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}, {"fbas", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}, {"bas", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}, -#ifdef PCB_HAVE_SYS_FUNGW +#ifdef RND_HAVE_SYS_FUNGW {"awk", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}, {"mawk", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}, {"lua", pcb_act_Oneliner, pcb_acth_Oneliner, pcb_acts_Oneliner}, Index: trunk/util/gsch2pcb-rnd/gsch2pcb.c =================================================================== --- trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30915) +++ trunk/util/gsch2pcb-rnd/gsch2pcb.c (revision 30916) @@ -270,7 +270,7 @@ load_project("/etc/gsch2pcb"); load_project("/usr/local/etc/gsch2pcb"); - path = pcb_concat(pcbhl_conf.rc.path.home, PCB_DIR_SEPARATOR_S, ".gEDA", PCB_DIR_SEPARATOR_S, "gsch2pcb", NULL); + path = pcb_concat(pcbhl_conf.rc.path.home, RND_DIR_SEPARATOR_S, ".gEDA", RND_DIR_SEPARATOR_S, "gsch2pcb", NULL); load_project(path); free(path);