[Pkg-gnupg-commit] [gnupg2] 128/205: indent: Help Emacs not to get confused by conditional compilation.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 7faf131c8b8710419df3dc13a1228d1977c55f53
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Apr 11 10:24:15 2016 +0200

    indent: Help Emacs not to get confused by conditional compilation.
    
    * agent/protect.c (calibrate_get_time) [W32]: Use separate function
    calls for W32 and W32CE.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 agent/protect.c | 4 +++-
 doc/HACKING     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/agent/protect.c b/agent/protect.c
index cdb39fd..f037703 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -95,11 +95,13 @@ calibrate_get_time (struct calibrate_time_s *data)
 #ifdef HAVE_W32_SYSTEM
 # ifdef HAVE_W32CE_SYSTEM
   GetThreadTimes (GetCurrentThread (),
+                  &data->creation_time, &data->exit_time,
+                  &data->kernel_time, &data->user_time);
 # else
   GetProcessTimes (GetCurrentProcess (),
-# endif
                    &data->creation_time, &data->exit_time,
                    &data->kernel_time, &data->user_time);
+# endif
 #else
   struct tms tmp;
 
diff --git a/doc/HACKING b/doc/HACKING
index 2f3dd43..11ae53b 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -51,6 +51,7 @@ are
  - build   :: Changes to the build system
  - speedo  :: Speedo build system specific changes
  - doc     :: Documentation changes
+ - indent  :: Indentation and similar changes
 
 Typo fixes and documentation updates don't need a ChangeLog entry;
 thus you would use a commit message like

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git