From f7e89ba9ea82ed2a79413b7c323bca79ac26c747 Mon Sep 17 00:00:00 2001
From: Andreas Schuh <andreas.schuh.84@gmail.com>
Date: Sun, 21 Apr 2013 03:38:25 +0100
Subject: Move public header files to src/ subdirectory. Copy them to
 <prefix>/include/<ns>/ upon installation.

---
 src/gflags.cc | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/gflags.cc')

diff --git a/src/gflags.cc b/src/gflags.cc
index dc82547..6c3c93e 100644
--- a/src/gflags.cc
+++ b/src/gflags.cc
@@ -87,18 +87,14 @@
 // other hand, hooks into CommandLineFlagParser.  Other API functions
 // are, similarly, mostly hooks into the functionality described above.
 
-// This comes first to ensure we define __STDC_FORMAT_MACROS in time.
-#include <config.h>
-#if HAVE_INTTYPES_H && !defined(__STDC_FORMAT_MACROS)
-# define __STDC_FORMAT_MACROS 1   // gcc requires this to get PRId64, etc.
-#endif
+#include "config.h"
+#include "gflags.h"
 
-#include <gflags/gflags.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #if HAVE_FNMATCH_H
-# include <fnmatch.h>
+#  include <fnmatch.h>
 #endif
 #include <stdarg.h> // For va_list and related operations
 #include <stdio.h>
@@ -109,13 +105,10 @@
 #include <string>
 #include <utility>     // for pair<>
 #include <vector>
+
 #include "mutex.h"
 #include "util.h"
 
-#ifndef PATH_SEPARATOR
-#  define PATH_SEPARATOR  '/'
-#endif
-
 
 // Special flags, type 1: the 'recursive' flags.  They set another flag's val.
 DEFINE_string(flagfile, "",
-- 
cgit v1.2.3