Removes XrmI.h header that only contained this single macro Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> --- src/Makefile.am | 1 - src/Xrm.c | 9 +++++++-- src/XrmI.h | 46 ---------------------------------------------- 3 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 src/XrmI.h
diff --git a/src/Makefile.am b/src/Makefile.am index 8b0953c..71e02e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -321,7 +321,6 @@ libX11_la_SOURCES = \ XomGeneric.h \ Xresinternal.h \ Xrm.c \ - XrmI.h \ Xxcbint.h # diff --git a/src/Xrm.c b/src/Xrm.c index fbc8ad2..4337534 100644 --- a/src/Xrm.c +++ b/src/Xrm.c @@ -60,7 +60,6 @@ from The Open Group. #ifdef XTHREADS #include "locking.h" #endif -#include "XrmI.h" #include <X11/Xos.h> #include "Xresinternal.h" #include "Xresource.h" @@ -1594,7 +1593,13 @@ ReadInFile(_Xconst char *filename) * result that the number of bytes actually read with be <= * to the size returned by fstat. */ - GetSizeOfFile(fd, size); + { + struct stat status_buffer; + if ( (fstat((fd), &status_buffer)) == -1 ) + size = -1; + else + size = status_buffer.st_size; + } /* There might have been a problem trying to stat a file */ if (size == -1) { diff --git a/src/XrmI.h b/src/XrmI.h deleted file mode 100644 index 7e25607..0000000 --- a/src/XrmI.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - -Copyright 1990, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -*/ - - -/* - * Macros to abstract out reading the file, and getting its size. - * - * You may need to redefine these for various other operating systems. - */ - -#include <X11/Xos.h> -#include <sys/stat.h> - -#define GetSizeOfFile(fd,size) \ -{ \ - struct stat status_buffer; \ - if ( (fstat((fd), &status_buffer)) == -1 ) \ - size = -1; \ - else \ - size = status_buffer.st_size; \ -} -- 1.7.3.2 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel