diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2008-10-29 16:15:32 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2008-10-29 16:15:32 -0700 |
| commit | 1ba75df69644ebd9285da48f1e8ddb2398bd66e1 (patch) | |
| tree | 7d2927f450a22ebb35b94e697356859056a0eb0c | |
| parent | d7e67781ef4fe7d2f83e16fe8616d0635e6af2f4 (diff) | |
96.43.0996.43.09
| -rw-r--r-- | src/XF86Config-parser/Generate.c | 19 | ||||
| -rw-r--r-- | src/libXNVCtrl/libXNVCtrl.a | bin | 17180 -> 17180 bytes |
2 files changed, 1 insertions, 18 deletions
diff --git a/src/XF86Config-parser/Generate.c b/src/XF86Config-parser/Generate.c index d61771a..6b31ace 100644 --- a/src/XF86Config-parser/Generate.c +++ b/src/XF86Config-parser/Generate.c @@ -48,7 +48,6 @@ static int is_file(const char *filename); -static void add_files(GenerateOptions *gop, XConfigPtr config); static void add_font_path(GenerateOptions *gop, XConfigPtr config); static void add_modules(GenerateOptions *gop, XConfigPtr config); @@ -72,7 +71,7 @@ XConfigPtr xconfigGenerate(GenerateOptions *gop) /* add files, fonts, and modules */ - add_files(gop, config); + config->files = xconfigAlloc(sizeof(XConfigFilesRec)); add_font_path(gop, config); add_modules(gop, config); @@ -255,22 +254,6 @@ static char *find_libdir(GenerateOptions *gop) /* - * add_files() - - */ - -static void add_files(GenerateOptions *gop, XConfigPtr config) -{ - char *libdir = find_libdir(gop); - - config->files = xconfigAlloc(sizeof(XConfigFilesRec)); - config->files->rgbpath = xconfigStrcat(libdir, "/X11/rgb", NULL); - - free(libdir); - -} /* add_files() */ - - -/* * add_font_path() - scan through the __font_paths[] array, * temporarily chop off the ":unscaled" appendage, and check for the * file "fonts.dir" in the directory. If fonts.dir exists, append the diff --git a/src/libXNVCtrl/libXNVCtrl.a b/src/libXNVCtrl/libXNVCtrl.a Binary files differindex 17e25a8..25b6ea7 100644 --- a/src/libXNVCtrl/libXNVCtrl.a +++ b/src/libXNVCtrl/libXNVCtrl.a |