kopia lustrzana https://gitlab.com/sane-project/backends
Added DIR_SEP and PATH_SEP defintions for windows
rodzic
0e43504ef4
commit
a28bd84350
|
@ -1,3 +1,11 @@
|
||||||
|
2004-05-16 Oliver Rauch <Oliver.Rauch@Rauch-DOmain.DE>
|
||||||
|
|
||||||
|
* sanei/sanei_config.c: added DIR_SEP=";" and PATH_SEP="\\"
|
||||||
|
for windows (when windows.h) is available
|
||||||
|
|
||||||
|
* backend/dll.c: added DIR_SEP definitions from sanei_config.c
|
||||||
|
and replaced relevant ":" by DIR_SEP
|
||||||
|
|
||||||
2004-05-15 Gerhard Jaeger <gerhard@gjaeger.de>
|
2004-05-15 Gerhard Jaeger <gerhard@gjaeger.de>
|
||||||
|
|
||||||
* doc/plustek/BUID: bumped up build number.
|
* doc/plustek/BUID: bumped up build number.
|
||||||
|
|
|
@ -99,6 +99,15 @@
|
||||||
# define PATH_MAX 1024
|
# define PATH_MAX 1024
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_OS2_H)
|
||||||
|
# define DIR_SEP ";"
|
||||||
|
#elif defined(HAVE_WINDOWS_H)
|
||||||
|
# define DIR_SEP ";"
|
||||||
|
#else
|
||||||
|
# define DIR_SEP ":"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#include "sane/sanei_config.h"
|
#include "sane/sanei_config.h"
|
||||||
#define DLL_CONFIG_FILE "dll.conf"
|
#define DLL_CONFIG_FILE "dll.conf"
|
||||||
#define DLL_ALIASES_FILE "dll.aliases"
|
#define DLL_ALIASES_FILE "dll.aliases"
|
||||||
|
@ -365,7 +374,7 @@ load (struct backend *be)
|
||||||
}
|
}
|
||||||
DBG (3, "load: searching backend `%s' in `%s'\n", be->name, src);
|
DBG (3, "load: searching backend `%s' in `%s'\n", be->name, src);
|
||||||
|
|
||||||
dir = strsep (&src, ":");
|
dir = strsep (&src, DIR_SEP);
|
||||||
|
|
||||||
while (dir)
|
while (dir)
|
||||||
{
|
{
|
||||||
|
@ -377,7 +386,7 @@ load (struct backend *be)
|
||||||
break;
|
break;
|
||||||
DBG (4, "load: couldn't open `%s' (%s)\n", libname, strerror (errno));
|
DBG (4, "load: couldn't open `%s' (%s)\n", libname, strerror (errno));
|
||||||
|
|
||||||
dir = strsep (&src, ":");
|
dir = strsep (&src, DIR_SEP);
|
||||||
}
|
}
|
||||||
if (orig_src)
|
if (orig_src)
|
||||||
free (orig_src);
|
free (orig_src);
|
||||||
|
|
|
@ -62,6 +62,9 @@
|
||||||
#if defined(HAVE_OS2_H)
|
#if defined(HAVE_OS2_H)
|
||||||
# define DIR_SEP ";"
|
# define DIR_SEP ";"
|
||||||
# define PATH_SEP '\\'
|
# define PATH_SEP '\\'
|
||||||
|
#elif defined(HAVE_WINDOWS_H)
|
||||||
|
# define DIR_SEP ";"
|
||||||
|
# define PATH_SEP '\\'
|
||||||
#else
|
#else
|
||||||
# define DIR_SEP ":"
|
# define DIR_SEP ":"
|
||||||
# define PATH_SEP '/'
|
# define PATH_SEP '/'
|
||||||
|
|
Ładowanie…
Reference in New Issue